diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
| commit | 1108cd0e5c052176f9dacc69b04d702a06b744de (patch) | |
| tree | 21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/cmake/BuildVersion.cmake | |
| parent | 2268bf38339178f93b317693c0a6808807301d64 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/cmake/BuildVersion.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 0094e313c7..b9ec8f5266 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} parents --template "{rev}" + COMMAND ${MERCURIAL} log -r tip --template "{p1rev}" OUTPUT_VARIABLE VIEWER_VERSION_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) |