Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv17668
Modified Files:
qhull.info
Log Message:
sync. w/ 10.!4/stable, resolved merge conflict
Index: qhull.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/qhull.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qhull.info 26 Nov 2011 20:59:22 -0000 1.3
+++ qhull.info 28 Nov 2011 00:02:10 -0000 1.4
@@ -1,10 +1,6 @@
Package: qhull
Version: 2002.1
-<<<<<<< qhull.info
-Revision: 12
-=======
Revision: 13
->>>>>>> 1.3
Description: Calculate convex hulls and related structures
License: BSD
Maintainer: Stefan Langerman <f...@slef.org>
@@ -12,13 +8,8 @@
Source-MD5: c86d0a6356929b44a3cc8a0ab80a78a4
SourceDirectory: qhull%v
BuildDepends: fink (>= 0.24.12-1)
-<<<<<<< qhull.info
-Conflicts: %n6, %n6-dev
-Replaces: %n6, %n6-dev
-=======
Conflicts: %n5, %n5-dev, %n6, %n6-dev
Replaces: %n5, %n5-dev, %n6, %n6-dev
->>>>>>> 1.3
PatchFile: %n.patch
PatchFile-MD5: 40e137bcce91e051c3456d7ba0668b5c
CompileScript: <<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
