[Cmake-commits] CMake branch, next, updated. v3.6.2-1981-g82c7905

[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  82c79051ec8c1790f98485b59caed1736fdf9d8e (commit)
       via  e952f1bdc7e5da3e50b9b36aeed6005c8d947ca6 (commit)
      from  23034b94d4722644d91047a5ba70d3f5f129d472 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82c79051ec8c1790f98485b59caed1736fdf9d8e
commit 82c79051ec8c1790f98485b59caed1736fdf9d8e
Merge: 23034b9 e952f1b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 13 11:57:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 13 11:57:24 2016 -0400

    Merge topic 'cmake-E-help-order' into next
    
    e952f1bd cmcmd: Fix sort order in help output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e952f1bdc7e5da3e50b9b36aeed6005c8d947ca6
commit e952f1bdc7e5da3e50b9b36aeed6005c8d947ca6
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Tue Sep 13 10:59:19 2016 +0200
Commit:     Tobias Hunger <tobias.hunger at qt.io>
CommitDate: Tue Sep 13 11:47:03 2016 +0200

    cmcmd: Fix sort order in help output
    
    sort "sleep" before "tar", not after

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index c2e1d53..900bba0 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -91,9 +91,9 @@ void CMakeCommandUsage(const char* program)
     << "  remove_directory dir      - remove a directory and its contents\n"
     << "  rename oldname newname    - rename a file or directory "
        "(on one volume)\n"
+    << "  sleep <number>...         - sleep for given number of seconds\n"
     << "  tar [cxt][vf][zjJ] file.tar [file/dir1 file/dir2 ...]\n"
     << "                            - create or extract a tar or zip archive\n"
-    << "  sleep <number>...         - sleep for given number of seconds\n"
     << "  time command [args...]    - run command and return elapsed time\n"
     << "  touch file                - touch a file.\n"
     << "  touch_nocreate file       - touch a file but do not create it.\n"

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

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


hooks/post-receive
-- 
CMake