diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-26 15:14:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-26 15:14:12 -0400 |
| commit | 7ca10e516126e5fa9b076c04957b491495513907 (patch) | |
| tree | 690323c7379c8151b1d7e251fa2878c10603fd61 /indra/cmake | |
| parent | 1e2a6ee3f440b7d076dc97f3a0628c90195f5386 (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 ) |