[Cmake-commits] CMake branch, next, updated. v3.0.2-5527-gaf9d532

[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  af9d532e111efecd25be155ece236826f132c0a3 (commit)
       via  5421b21ffb2b1eaae2fdb56c54a6352d61d888ee (commit)
      from  1291bdbecaad1b75c5e1691dd738d70b62fb15b9 (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=af9d532e111efecd25be155ece236826f132c0a3
commit af9d532e111efecd25be155ece236826f132c0a3
Merge: 1291bdb 5421b21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 30 08:45:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 30 08:45:20 2014 -0400

    Merge topic 'vs-nsight-tegra-generator' into next
    
    5421b21f Help: Specify values allowed for ANDROID_API target property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5421b21ffb2b1eaae2fdb56c54a6352d61d888ee
commit 5421b21ffb2b1eaae2fdb56c54a6352d61d888ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 30 08:42:34 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 30 08:42:34 2014 -0400

    Help: Specify values allowed for ANDROID_API target property

diff --git a/Help/prop_tgt/ANDROID_API.rst b/Help/prop_tgt/ANDROID_API.rst
index 82edb4e..714ad58 100644
--- a/Help/prop_tgt/ANDROID_API.rst
+++ b/Help/prop_tgt/ANDROID_API.rst
@@ -1,6 +1,7 @@
 ANDROID_API
 -----------
 
-Set the Android Target API version (e.g. ``15``).  This property is
-initialized by the value of the :variable:`CMAKE_ANDROID_API` variable
-if it is set when a target is created.
+Set the Android Target API version (e.g. ``15``).  The version number
+must be a positive decimal integer.  This property is initialized by
+the value of the :variable:`CMAKE_ANDROID_API` variable if it is set
+when a target is created.

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

Summary of changes:
 Help/prop_tgt/ANDROID_API.rst |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake