diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-09-14 16:25:54 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-09-14 16:25:54 -0700 |
| commit | 42a50551b52b8d1c5208d9d34354874b73d357f9 (patch) | |
| tree | 79d75a4a809c0b8753eb8a3bd779bec1bb9612a1 | |
| parent | 2f53e8e72c47d6a84c757a1f78a0287c2c6a9630 (diff) | |
| parent | ae127dc01ab10d407cf165ae2ad74060f65c1832 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
| -rw-r--r-- | BuildParams | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BuildParams b/BuildParams index 258dd43b41..05ae10281d 100644 --- a/BuildParams +++ b/BuildParams @@ -208,4 +208,5 @@ runway.build_debug_release_separately = true runway.build_CYGWIN_Debug = false runway.build_viewer_update_version_manager = false + # eof diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index bcc661a920..b12aa8826a 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -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"; |