Changes from releases/5.5.0 at r2102 to releases/5.5.1 at r2102
- Location:
- releases/5.5.1
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
releases/5.5.1/SYMPHONY
- Property svn:mergeinfo changed
/trunk/SYMPHONY merged: 2096
- Property svn:mergeinfo changed
-
releases/5.5.1/SYMPHONY/configure
r2102 r2102 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.5. 0.3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.5.1. 4 4 # 5 5 # Report bugs to <symphony@list.coin-or.org>. … … 440 440 PACKAGE_NAME='SYMPHONY' 441 441 PACKAGE_TARNAME='symphony' 442 PACKAGE_VERSION='5.5. 0'443 PACKAGE_STRING='SYMPHONY 5.5. 0'442 PACKAGE_VERSION='5.5.1' 443 PACKAGE_STRING='SYMPHONY 5.5.1' 444 444 PACKAGE_BUGREPORT='symphony@list.coin-or.org' 445 445 … … 1016 1016 # This message is too long to be a string in the A/UX 3.1 sh. 1017 1017 cat <<_ACEOF 1018 \`configure' configures SYMPHONY 5.5. 0to adapt to many kinds of systems.1018 \`configure' configures SYMPHONY 5.5.1 to adapt to many kinds of systems. 1019 1019 1020 1020 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1082 1082 if test -n "$ac_init_help"; then 1083 1083 case $ac_init_help in 1084 short | recursive ) echo "Configuration of SYMPHONY 5.5. 0:";;1084 short | recursive ) echo "Configuration of SYMPHONY 5.5.1:";; 1085 1085 esac 1086 1086 cat <<\_ACEOF … … 1336 1336 if $ac_init_version; then 1337 1337 cat <<\_ACEOF 1338 SYMPHONY configure 5.5. 01338 SYMPHONY configure 5.5.1 1339 1339 generated by GNU Autoconf 2.59 1340 1340 … … 1366 1366 running configure, to aid debugging if configure makes a mistake. 1367 1367 1368 It was created by SYMPHONY $as_me 5.5. 0, which was1368 It was created by SYMPHONY $as_me 5.5.1, which was 1369 1369 generated by GNU Autoconf 2.59. Invocation command line was 1370 1370 … … 1892 1892 1893 1893 # Capture libtool library version, if given. 1894 coin_libversion=8: 0:51894 coin_libversion=8:1:5 1895 1895 1896 1896 … … 4770 4770 # Define the identity of the package. 4771 4771 PACKAGE='symphony' 4772 VERSION='5.5. 0'4772 VERSION='5.5.1' 4773 4773 4774 4774 … … 30039 30039 cat >&5 <<_CSEOF 30040 30040 30041 This file was extended by SYMPHONY $as_me 5.5. 0, which was30041 This file was extended by SYMPHONY $as_me 5.5.1, which was 30042 30042 generated by GNU Autoconf 2.59. Invocation command line was 30043 30043 … … 30102 30102 cat >>$CONFIG_STATUS <<_ACEOF 30103 30103 ac_cs_version="\\ 30104 SYMPHONY config.status 5.5. 030104 SYMPHONY config.status 5.5.1 30105 30105 configured by $0, generated by GNU Autoconf 2.59, 30106 30106 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/5.5.1/SYMPHONY/configure.ac
r2102 r2102 23 23 AC_PREREQ(2.59) 24 24 25 AC_INIT([SYMPHONY],[5.5. 0],[symphony@list.coin-or.org])25 AC_INIT([SYMPHONY],[5.5.1],[symphony@list.coin-or.org]) 26 26 27 27 AC_COPYRIGHT([ … … 62 62 # externals. The following macro ensures that those externals are 63 63 # retrieved by svn if they are not there yet. 64 AC_COIN_PROJECTDIR_INIT(SYMPHONY,8: 0:5)64 AC_COIN_PROJECTDIR_INIT(SYMPHONY,8:1:5) 65 65 66 66 # Check if user wants to produce debugging code -
releases/5.5.1/SYMPHONY/include/config_sym_default.h
r2102 r2102 6 6 7 7 /* Version number of project */ 8 #define SYMPHONY_VERSION "5.5. 0"8 #define SYMPHONY_VERSION "5.5.1" 9 9 10 10 /* Major Version number of project */ … … 15 15 16 16 /* Release Version number of project */ 17 #define SYMPHONY_VERSION_RELEASE 017 #define SYMPHONY_VERSION_RELEASE 1 18 18 19 19 -
releases/5.5.1/SYMPHONY/src/LP/lp_heuristics.c
- Property svn:mergeinfo deleted
-
releases/5.5.1/SYMPHONY/src/LP/lp_sp.c
- Property svn:mergeinfo deleted
-
releases/5.5.1/SYMPHONY/src/Master/master.c
r2102 r2102 479 479 480 480 /* local branching */ 481 #ifdef USE_SYM_APPLICATION 482 lp_par->lb_enabled = FALSE; 483 #else 481 484 lp_par->lb_enabled = TRUE; 485 #endif 482 486 lp_par->lb_frequency = 10; 483 487 lp_par->lb_min_gap = 1.0; -
releases/5.5.1/SYMPHONY/src/Master/master_prep.c
- Property svn:mergeinfo deleted
-
releases/5.5.1/SYMPHONY/src/Master/master_prep_base.c
- Property svn:mergeinfo deleted
-
releases/5.5.1/SYMPHONY/src/Master/master_prep_sr.c
- Property svn:mergeinfo deleted
-
releases/5.5.1/configure
r2102 r2102 2 2 # From configure.ac 0.9. 3 3 # Guess values for system-dependent variables and create Makefiles. 4 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.5. 0.4 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.5.1. 5 5 # 6 6 # Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>. … … 441 441 PACKAGE_NAME='SYMPHONY' 442 442 PACKAGE_TARNAME='symphony' 443 PACKAGE_VERSION='5.5. 0'444 PACKAGE_STRING='SYMPHONY 5.5. 0'443 PACKAGE_VERSION='5.5.1' 444 PACKAGE_STRING='SYMPHONY 5.5.1' 445 445 PACKAGE_BUGREPORT='https://projects.coin-or.org/svn/SYMPHONY/newticket' 446 446 … … 1045 1045 # This message is too long to be a string in the A/UX 3.1 sh. 1046 1046 cat <<_ACEOF 1047 \`configure' configures SYMPHONY 5.5. 0to adapt to many kinds of systems.1047 \`configure' configures SYMPHONY 5.5.1 to adapt to many kinds of systems. 1048 1048 1049 1049 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1111 1111 if test -n "$ac_init_help"; then 1112 1112 case $ac_init_help in 1113 short | recursive ) echo "Configuration of SYMPHONY 5.5. 0:";;1113 short | recursive ) echo "Configuration of SYMPHONY 5.5.1:";; 1114 1114 esac 1115 1115 cat <<\_ACEOF … … 1326 1326 if $ac_init_version; then 1327 1327 cat <<\_ACEOF 1328 SYMPHONY configure 5.5. 01328 SYMPHONY configure 5.5.1 1329 1329 generated by GNU Autoconf 2.59 1330 1330 … … 1356 1356 running configure, to aid debugging if configure makes a mistake. 1357 1357 1358 It was created by SYMPHONY $as_me 5.5. 0, which was1358 It was created by SYMPHONY $as_me 5.5.1, which was 1359 1359 generated by GNU Autoconf 2.59. Invocation command line was 1360 1360 … … 5344 5344 # Define the identity of the package. 5345 5345 PACKAGE='symphony' 5346 VERSION='5.5. 0'5346 VERSION='5.5.1' 5347 5347 5348 5348 … … 23040 23040 cat >&5 <<_CSEOF 23041 23041 23042 This file was extended by SYMPHONY $as_me 5.5. 0, which was23042 This file was extended by SYMPHONY $as_me 5.5.1, which was 23043 23043 generated by GNU Autoconf 2.59. Invocation command line was 23044 23044 … … 23098 23098 cat >>$CONFIG_STATUS <<_ACEOF 23099 23099 ac_cs_version="\\ 23100 SYMPHONY config.status 5.5. 023100 SYMPHONY config.status 5.5.1 23101 23101 configured by $0, generated by GNU Autoconf 2.59, 23102 23102 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/5.5.1/configure.ac
r2102 r2102 23 23 AC_PREREQ(2.59) 24 24 25 AC_INIT([SYMPHONY],[5.5. 0],[https://projects.coin-or.org/svn/SYMPHONY/newticket])25 AC_INIT([SYMPHONY],[5.5.1],[https://projects.coin-or.org/svn/SYMPHONY/newticket]) 26 26 27 27 AC_COPYRIGHT([
Note: See TracChangeset
for help on using the changeset viewer.