Merge

Fri, 28 Mar 2014 16:25:07 -0700

author
asaha
date
Fri, 28 Mar 2014 16:25:07 -0700
changeset 1026
49d1cab5edd9
parent 1023
6d866bb92d25
parent 1025
a14345c657e4
child 1027
065b9ded4bf2

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Mar 20 10:33:39 2014 -0700
     1.2 +++ b/.hgtags	Fri Mar 28 16:25:07 2014 -0700
     1.3 @@ -253,6 +253,10 @@
     1.4  2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
     1.5  101e42de46869e6604fbf095e1666fbf07fcb93c jdk8-b128
     1.6  1e5fe865491300cd0c63261ecf8d34e621e1345c jdk8-b129
     1.7 +cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
     1.8 +6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
     1.9 +7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
    1.10 +69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05
    1.11  839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130
    1.12  0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131
    1.13  2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132
    1.14 @@ -269,6 +273,7 @@
    1.15  dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11
    1.16  3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12
    1.17  d81e301cae70f1f95f4bb976ec053c915dee503a jdk8u5-b13
    1.18 +ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
    1.19  cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
    1.20  6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
    1.21  7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
     2.1 --- a/common/autoconf/generated-configure.sh	Thu Mar 20 10:33:39 2014 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Fri Mar 28 16:25:07 2014 -0700
     2.3 @@ -3865,7 +3865,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1390334534
     2.8 +DATE_WHEN_GENERATED=1396039024
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -34377,7 +34377,7 @@
    2.13      fi
    2.14  
    2.15      if test "x${with_alsa}" != x; then
    2.16 -      ALSA_LIBS="-L${with_alsa}/lib -lalsa"
    2.17 +      ALSA_LIBS="-L${with_alsa}/lib -lasound"
    2.18        ALSA_CFLAGS="-I${with_alsa}/include"
    2.19        ALSA_FOUND=yes
    2.20      fi
    2.21 @@ -34386,7 +34386,7 @@
    2.22        ALSA_FOUND=yes
    2.23      fi
    2.24      if test "x${with_alsa_lib}" != x; then
    2.25 -      ALSA_LIBS="-L${with_alsa_lib} -lalsa"
    2.26 +      ALSA_LIBS="-L${with_alsa_lib} -lasound"
    2.27        ALSA_FOUND=yes
    2.28      fi
    2.29      if test "x$ALSA_FOUND" = xno; then
     3.1 --- a/common/autoconf/libraries.m4	Thu Mar 20 10:33:39 2014 -0700
     3.2 +++ b/common/autoconf/libraries.m4	Fri Mar 28 16:25:07 2014 -0700
     3.3 @@ -554,7 +554,7 @@
     3.4      fi
     3.5  
     3.6      if test "x${with_alsa}" != x; then
     3.7 -      ALSA_LIBS="-L${with_alsa}/lib -lalsa"
     3.8 +      ALSA_LIBS="-L${with_alsa}/lib -lasound"
     3.9        ALSA_CFLAGS="-I${with_alsa}/include"
    3.10        ALSA_FOUND=yes
    3.11      fi
    3.12 @@ -563,7 +563,7 @@
    3.13        ALSA_FOUND=yes
    3.14      fi
    3.15      if test "x${with_alsa_lib}" != x; then
    3.16 -      ALSA_LIBS="-L${with_alsa_lib} -lalsa"
    3.17 +      ALSA_LIBS="-L${with_alsa_lib} -lasound"
    3.18        ALSA_FOUND=yes
    3.19      fi
    3.20      if test "x$ALSA_FOUND" = xno; then

mercurial