Skip to content
Snippets Groups Projects
Commit 1fbf3e0e authored by Don Kjer's avatar Don Kjer
Browse files

Merge viewer-development -> viewer-sandbox

parents 45c6dcbe e35cc6f4
No related branches found
No related tags found
Loading
...@@ -130,3 +130,4 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release ...@@ -130,3 +130,4 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1 0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1
0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1 0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1
9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start 9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start
6a3e7e403bd19e45fdfc2fcc716867af3ab80861 2.7.3-start
...@@ -178,9 +178,10 @@ oz_viewer-devreview.build_debug_release_separately = true ...@@ -178,9 +178,10 @@ oz_viewer-devreview.build_debug_release_separately = true
oz_project-1.build_debug_release_separately = true oz_project-1.build_debug_release_separately = true
oz_project-2.build_debug_release_separately = true oz_project-2.build_debug_release_separately = true
oz-project-3.build_debug_release_separately = true oz-project-3.build_debug_release_separately = true
oz_viewer-beta-review.build_debug_release_separately = true oz_viewer-beta-review.build_debug_release_separately = true
oz_viewer-poreview.build_debug_release_separately = true
oz_viewer-poreview.codeticket_add_context = false
# ======================================== # ========================================
# enus # enus
# ======================================== # ========================================
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 7; const S32 LL_VERSION_MINOR = 7;
const S32 LL_VERSION_PATCH = 3; const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_BUILD = 0; const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer"; const char * const LL_CHANNEL = "Second Life Developer";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment