summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-07-26 22:59:30 +0000
committerDon Kjer <don@lindenlab.com>2012-07-26 22:59:30 +0000
commitbd1b664d45a75e57209e06b288849c0536d00151 (patch)
tree863ba132ec822f7f2a3feaf5a934f298374179cd /indra/llcommon/llversionviewer.h
parentcff3469d46d297fbec34bc0d648588e900cd255c (diff)
parent124f45d20ecf45c43a9f277be89de2e1fec40b8b (diff)
Merge viewer-development -> viewer-horde-fixes
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 9af16a0ed8..2038681905 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 = 3;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_MINOR = 4;
+const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";