[Cmake-commits] CMake branch, next, updated. v2.8.5-1958-geb9039e

[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  eb9039eb9ae59d858277974360a6ba7e97065d47 (commit)
       via  f8c77fa97b0dc7d6c55a15d980f123f2e41cef40 (commit)
      from  d66bbbda7f7ed904a06effdda0a29693167dfe65 (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=eb9039eb9ae59d858277974360a6ba7e97065d47
commit eb9039eb9ae59d858277974360a6ba7e97065d47
Merge: d66bbbd f8c77fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 23 08:23:46 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 23 08:23:46 2011 -0400

    Merge topic 'doc-set_target_properties-typo' into next
    
    f8c77fa Fix typo in set_target_properties' documentation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8c77fa97b0dc7d6c55a15d980f123f2e41cef40
commit f8c77fa97b0dc7d6c55a15d980f123f2e41cef40
Author:     Raphael Kubo da Costa <rakuco at FreeBSD.org>
AuthorDate: Thu Sep 22 23:04:14 2011 -0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 23 08:16:08 2011 -0400

    Fix typo in set_target_properties' documentation.
    
    our -> or

diff --git a/Source/cmSetTargetPropertiesCommand.h b/Source/cmSetTargetPropertiesCommand.h
index feead00..320378d 100644
--- a/Source/cmSetTargetPropertiesCommand.h
+++ b/Source/cmSetTargetPropertiesCommand.h
@@ -92,7 +92,7 @@ public:
         "If not set here then it is set to target_EXPORTS by default "
         "(with some substitutions if the target is not a valid C "
         "identifier). This is useful for headers to know whether they are "
-        "being included from inside their library our outside to properly "
+        "being included from inside their library or outside to properly "
         "setup dllexport/dllimport decorations. "
         "The COMPILE_FLAGS property sets additional compiler flags used "
         "to build sources within the target.  It may also be used to pass "

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

Summary of changes:
 Source/cmSetTargetPropertiesCommand.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake