summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-06-13 22:25:29 +0000
committerDon Kjer <don@lindenlab.com>2011-06-13 22:25:29 +0000
commit1fbf3e0ec297004879d766cad11c5e9e15b86d4b (patch)
treebe106ed2b6275e52e7753ee2e9c1a84ccea73aad /indra
parent45c6dcbe87fbfc1351e4faa9ef3196a191b7dd69 (diff)
parente35cc6f42b4c02f1d7a05083c3b14de6c222f90a (diff)
Merge viewer-development -> viewer-sandbox
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llversionviewer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index fa92a3a75b..cfafbf0470 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 7;
-const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";