From 0c2158a88ed33c3402e28e6272d2d531cb36586c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Feb 11 2006 15:49:50 +0000
Subject: 2.9.6


---

diff --git a/.cvsignore b/.cvsignore
index cb00137..7f7d863 100644
--- 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
diff --git a/glib2.spec b/glib2.spec
index 0e5726b..0ab700e 100644
--- 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
diff --git a/sources b/sources
index 927123d..1394599 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d92467e6a644341d704a5d0e3af8c06f  glib-2.9.5.tar.bz2
+2ba1146e767454e14ac0788187c35892  glib-2.9.6.tar.bz2