[libcxx] r242494 - Merging r242421:

[Hans Wennborg]

Author: hans
Date: Thu Jul 16 19:58:59 2015
New Revision: 242494

URL: http://llvm.org/viewvc/llvm-project?rev=242494&view=rev
Log:
Merging r242421:
------------------------------------------------------------------------
r242421 | marshall | 2015-07-16 10:22:24 -0700 (Thu, 16 Jul 2015) | 1 line

Set the libc++ version # to 3.7.   Will bump to 3.8 soon
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_37/   (props changed)
    libcxx/branches/release_37/include/__config

Propchange: libcxx/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 19:58:59 2015
@@ -1 +1,2 @@
 /libcxx/branches/apple:136569-137939
+/libcxx/trunk:242421

Modified: libcxx/branches/release_37/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_37/include/__config?rev=242494&r1=242493&r2=242494&view=diff
==============================================================================
--- libcxx/branches/release_37/include/__config (original)
+++ libcxx/branches/release_37/include/__config Thu Jul 16 19:58:59 2015
@@ -21,7 +21,7 @@
 #define _GNUC_VER 0
 #endif
 
-#define _LIBCPP_VERSION 1101
+#define _LIBCPP_VERSION 3700
 
 #define _LIBCPP_ABI_VERSION 1