[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gtk2/devel gtk2.spec,1.86,1.87



Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13496

Modified Files:
	gtk2.spec 
Log Message:
Fix conflict



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gtk2.spec	4 Aug 2005 13:49:11 -0000	1.86
+++ gtk2.spec	4 Aug 2005 13:50:11 -0000	1.87
@@ -10,11 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-<<<<<<< gtk2.spec
 %define base_version 2.7.5
-=======
-%define base_version 2.7.4
->>>>>>> 1.85
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]