rpms/gnome-desktop/devel gnome-desktop.spec,1.205,1.206
Ray Strode
rstrode at fedoraproject.org
Tue Mar 10 17:26:25 UTC 2009
- Previous message: rpms/gnome-desktop/devel gnome-desktop.spec,1.204,1.205
- Next message: rpms/gimp/devel .cvsignore, 1.49, 1.50 gimp.spec, 1.184, 1.185 sources, 1.49, 1.50 gimp-2.6.5-define-deprecated.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7834
Modified Files:
gnome-desktop.spec
Log Message:
remove conflict indicators
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- gnome-desktop.spec 10 Mar 2009 17:25:34 -0000 1.205
+++ gnome-desktop.spec 10 Mar 2009 17:25:54 -0000 1.206
@@ -135,7 +135,6 @@
* Tue Feb 3 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.90-1
- Update to 2.25.90
->>>>>>> 1.204
* Mon Jan 19 2009 Ray Strode <rstrode at redhat.com> - 2.25.5-2
- Rebuild so i can chain-build
- Previous message: rpms/gnome-desktop/devel gnome-desktop.spec,1.204,1.205
- Next message: rpms/gimp/devel .cvsignore, 1.49, 1.50 gimp.spec, 1.184, 1.185 sources, 1.49, 1.50 gimp-2.6.5-define-deprecated.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list