diff --git a/.cvsignore b/.cvsignore index 9b273e1..3f2d816 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,8 +1 @@ -<<<<<<< .cvsignore -gnome-menus-2.11.91.tar.bz2 -gnome-menus-2.12.0.tar.bz2 -======= -gnome-menus-2.12.0.tar.bz2 ->>>>>>> 1.10 -gnome-menus-2.13.5.tar.bz2 -gnome-menus-2.14.0.tar.bz2 +gnome-menus-2.15.4.1.tar.bz2 diff --git a/gnome-menus.spec b/gnome-menus.spec index 3da7d48..5473f26 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -6,8 +6,8 @@ Summary: A menu system for the GNOME project Name: gnome-menus -Version: 2.14.0 -Release: 4.1 +Version: 2.15.4 +Release: 1 License: LGPL Group: System Environment/Libraries URL: http://www.gnome.org/ @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gnome-menu-spec-test %changelog +* Wed Jul 12 2006 Matthias Clasen - 2.15.4-1 +- Update to 2.15.4 + * Wed Jul 12 2006 Jesse Keating - 2.14.0-4.1 - rebuild diff --git a/sources b/sources index b7270a8..3206c26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7aa0c08fc8b9caabb4be46e1cfb595fc gnome-menus-2.14.0.tar.bz2 +2a28a9abba689205a05ece3d0fa93a0b gnome-menus-2.15.4.1.tar.bz2