rpms/nemiver/devel nemiver.spec,1.29,1.30
Dodji Seketeli
dodji at fedoraproject.org
Sat Aug 1 11:10:35 UTC 2009
- Previous message: rpms/nemiver/devel .cvsignore, 1.18, 1.19 nemiver.spec, 1.28, 1.29 sources, 1.18, 1.19
- Next message: rpms/nemiver/F-11 .cvsignore, 1.18, 1.19 nemiver.spec, 1.26, 1.27 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dodji
Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31352
Modified Files:
nemiver.spec
Log Message:
Properly resolve conflict
Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nemiver.spec 1 Aug 2009 11:09:40 -0000 1.29
+++ nemiver.spec 1 Aug 2009 11:10:34 -0000 1.30
@@ -1,11 +1,6 @@
Name: nemiver
-<<<<<<< nemiver.spec
Version: 0.7.1
Release: 1%{?dist}
-=======
-Version: 0.7.0
-Release: 3%{?dist}
->>>>>>> 1.28
Summary: A GNOME C/C++ Debugger
Group: Development/Debuggers
- Previous message: rpms/nemiver/devel .cvsignore, 1.18, 1.19 nemiver.spec, 1.28, 1.29 sources, 1.18, 1.19
- Next message: rpms/nemiver/F-11 .cvsignore, 1.18, 1.19 nemiver.spec, 1.26, 1.27 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list