summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-03-05 11:13:40 -0800
committerMerov Linden <merov@lindenlab.com>2013-03-05 11:13:40 -0800
commit96225b44247fc991d5ad2d856cde7d9f9aef412b (patch)
tree665d5f01c649b90715ed6513347656d637293ebf
parent6600c6dcc910cc7468f9f9eaac42a5df0ccf75cf (diff)
parente03b1d89898433596604bb36d5ddfa64092ba91a (diff)
Pull from viewer-beta (version number update and tag)
-rw-r--r--.hgtags2
-rw-r--r--indra/llcommon/llversionviewer.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index fe3aae1b99..2aa78a5ed0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -420,3 +420,5 @@ b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292
0a5d409161ef2a89b28c9a741051dd2dedc707d6 DRTVWR-297
852b69ef0b5fe6b13b69cc2217282cc64de6afab 3.4.5-beta5
a49c715243a36a8a380504d14cb7416b3039c956 3.4.5-release
+279ef1dfc9b749a6cc499cf190fec0c090b6d682 DRTVWR-288
+9b19edaf1d8ddf435f60fbbb444dd25db8f63953 3.5.0-beta1
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";