Changeset 1464 for trunk/Cbc/osi-cbc-uninstalled.pc.in

Timestamp:

Jun 7, 2010 8:27:42 AM (10 years ago)

Author:

stefan

Message:

merge split branch into trunk; fix some examples

Location:

trunk

Files:

• . (modified) (2 props)
• Cbc (modified) (1 prop)
• Cbc/osi-cbc-uninstalled.pc.in (copied) (copied from branches/split/Cbc/osi-cbc-uninstalled.pc.in)

trunk

@@ -1 @@
-BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
-ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
-ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
-ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
-ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
-Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
-CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
-Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
-Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
-Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
-Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
+BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
+ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
+ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
+ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
+Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
+#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
+Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
+#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol

@@ -1 @@
-BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
-ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
-ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
-ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
-ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
-Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
-CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
-Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
-Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
-Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
-Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
+BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
+ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
+ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
+ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
+Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
+#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
+Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
+#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol

@@ -1 @@
-BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
-ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
-ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
-ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
-ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
-Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
-CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
-Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
-Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
-Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
-Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
+BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
+ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
+ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
+ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
+Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
+#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
+Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
+#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol