diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
| commit | a359d9d80c013b7c6cd594bb8d94b8950fdcdf55 (patch) | |
| tree | 7b687542962149ec448d436dbe62fe8ebac25d63 /indra/cmake | |
| parent | f46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merge changes for 3.6.4-release
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/BuildVersion.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index b9ec8f5266..af2063ce6d 100755 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -18,7 +18,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n find_program(MERCURIAL hg) if (DEFINED MERCURIAL) execute_process( - COMMAND ${MERCURIAL} log -r tip --template "{p1rev}" + COMMAND ${MERCURIAL} log -r tip --template "{rev}" OUTPUT_VARIABLE VIEWER_VERSION_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) |