summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-03-06 18:45:40 -0800
committerMerov Linden <merov@lindenlab.com>2013-03-06 18:45:40 -0800
commit179195241f5579ceeea682d7faf23dc2376338ec (patch)
treeaef237271227a9faccc1414173c7efd6d4c5657a /indra/llcommon
parent4458986cf22a749d3387085a70ea07930519b8ab (diff)
parent236eefd9c8afbdd1f9e8b32cd8d356a6c0b6b2ac (diff)
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/llcommon')
-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 6a5ff314e4..1554e9e665 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 = 4;
-const S32 LL_VERSION_PATCH = 6;
+const S32 LL_VERSION_MINOR = 5;
+const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";