Merge minor changes from viewer-development

meow-7.2.2
simon@Simon-PC.lindenlab.com 2012-09-17 13:51:48 -07:00
commit 307368f70e
2 changed files with 2 additions and 1 deletions

View File

@ -197,4 +197,5 @@ runway.build_debug_release_separately = true
runway.build_CYGWIN_Debug = false
runway.build_viewer_update_version_manager = false
# eof

View File

@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 3;
const S32 LL_VERSION_MINOR = 4;
const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";