[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-701-g5d6f4b8

[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  5d6f4b8df932f684ab590174993c046d5659e399 (commit)
       via  166aa7af334bed63966f64b46fcac7ddfca952b1 (commit)
      from  f63f8cb58d53d9a1afe06a48a356c35d86f6ae9b (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=5d6f4b8df932f684ab590174993c046d5659e399
commit 5d6f4b8df932f684ab590174993c046d5659e399
Merge: f63f8cb 166aa7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 10:07:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 26 10:07:14 2015 -0400

    Merge topic 'vs-librarian-machine-flag-default' into next
    
    166aa7af fixup! VS: Add /machine: flag to Librarian tool (#11240)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=166aa7af334bed63966f64b46fcac7ddfca952b1
commit 166aa7af334bed63966f64b46fcac7ddfca952b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 10:06:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 26 10:06:46 2015 -0400

    fixup! VS: Add /machine: flag to Librarian tool (#11240)

diff --git a/Tests/VSResource/lib.rc b/Tests/VSResource/lib.rc
index e69de29..1ffade6 100644
--- a/Tests/VSResource/lib.rc
+++ b/Tests/VSResource/lib.rc
@@ -0,0 +1,4 @@
+STRINGTABLE
+BEGIN
+  1234 "5"
+END

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

Summary of changes:
 Tests/VSResource/lib.rc |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake