2.9.6

2006-02-11 15:49:50 +00:00 · 2006-02-11 15:49:50 +00:00 · 0c2158a88e
commit 0c2158a88e
parent 9d373e05c4
3 changed files with 2 additions and 6 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -30,3 +30,4 @@ glib-2.9.2.tar.bz2
 glib-2.9.3.tar.bz2
 glib-2.9.4.tar.bz2
 glib-2.9.5.tar.bz2
+glib-2.9.6.tar.bz2
--- a/glib2.spec
+++ b/glib2.spec
@ -1,12 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
-<<<<<<< glib2.spec
 Version: 2.9.6
 Release: 1
-=======
-Version: 2.9.5
-Release: 1.2
->>>>>>> 1.77
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
--- a/2
+++ b/2
@ -1 +1 @@
-d92467e6a644341d704a5d0e3af8c06f  glib-2.9.5.tar.bz2
+2ba1146e767454e14ac0788187c35892  glib-2.9.6.tar.bz2