summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-05 16:39:32 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-05 16:39:32 -0700
commitd8489166645f2e3ea7edd252997f9f48aa0871c3 (patch)
treee2f5c52f0c397b0dfb1d0e3cb47ca59d609292dc /indra/llcommon/llversionviewer.h
parent17c699e4281ffff58e24c5db960a5c33018f1747 (diff)
parenta88bb3231b2685eb640710d7617d26b7f3a2c0d2 (diff)
Merge with latest
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-rw-r--r--indra/llcommon/llversionviewer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ef55cfec89..e4ad7f4f54 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,8 +28,8 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 3;
-const S32 LL_VERSION_MINOR = 0;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_MINOR = 1;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";