[Cmake-commits] CMake branch, next, updated. v3.0.0-4689-gd835f7e

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d835f7e28f36029f742128b593dda13bcb2d05f0 (commit)
       via  66edd06587bfaafc2cb1f24286925750454ec9cc (commit)
      from  b6bb564f94488d04428479076bdfc3c220ad4a81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d835f7e28f36029f742128b593dda13bcb2d05f0
commit d835f7e28f36029f742128b593dda13bcb2d05f0
Merge: b6bb564 66edd06
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 31 10:39:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 31 10:39:51 2014 -0400

    Merge topic 'vs-vcxproj-missing-newline' into next
    
    66edd065 VS: Add missing newline after .vcxproj user prop import line


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66edd06587bfaafc2cb1f24286925750454ec9cc
commit 66edd06587bfaafc2cb1f24286925750454ec9cc
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Jul 30 14:10:49 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 31 10:39:21 2014 -0400

    VS: Add missing newline after .vcxproj user prop import line

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d9013e0..6989d95 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -376,7 +376,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
   this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
                     " Condition=\"exists('" VS10_USER_PROPS "')\""
-                    " Label=\"LocalAppDataPlatform\" />", 2);
+                    " Label=\"LocalAppDataPlatform\" />\n", 2);
   this->WriteString("</ImportGroup>\n", 1);
   this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
   this->WritePathAndIncrementalLinkOptions();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake