common tobuild,1.275,1.276

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23778

Modified Files:
	tobuild 
Log Message:
fix conflicts



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- tobuild	9 May 2005 14:08:29 -0000	1.275
+++ tobuild	9 May 2005 14:10:41 -0000	1.276
@@ -1,18 +1,11 @@
 # this is the build control file.  the format is
 # user	repo	tag	target	status
 # 
-<<<<<<< tobuild
 skvidal	rpms/verbiste/devel	verbiste-0_1_10-4	development
 oliver	rpms/apg/FC-3	apg-2_3_0b-1	fc3
-=======
-corsepiu	rpms/SoQt/FC-3	SoQt-1_2_0-4_fc3	FC3
-gemi	rpms/graveman/FC-3	graveman-0_3_11-2	FC3
-corsepiu	rpms/Coin2/devel	Coin2-2_3_0-8_fc4	devel
-corsepiu	rpms/SoQt/devel	SoQt-1_2_0-4_fc4	devel
-thl	rpms/Macaulay2/FC-3	Macaulay2-0_9_2-14	FC3
-nphilipp	rpms/bzflag/devel	bzflag-2_0_2-3	devel
->>>>>>> 1.269
 oliver	rpms/apg/devel	apg-2_3_0b-1_fc4	devel
 oliver	rpms/apg/FC-3	apg-2_3_0b-1	FC3
 thias	rpms/gcombust/devel	gcombust-0_1_55-6	development
 thias	rpms/synergy/devel	synergy-1_2_2-3	development
+c4chris	rpms/nfswatch/devel	nfswatch--	devel
+nphilipp	rpms/bzflag/devel	bzflag-2_0_2-4	devel