summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionserver.h
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2008-10-01 00:42:47 +0000
committerChristian Goetze <cg@lindenlab.com>2008-10-01 00:42:47 +0000
commitb069bb9e71d31495f3f1312529d19fdb83c1779e (patch)
treecf7575a0025224c1f9b93a47a9879d9b280a5299 /indra/llcommon/llversionserver.h
parentd725e5b24075b2171f8a5b263969991e9b475078 (diff)
svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Diffstat (limited to 'indra/llcommon/llversionserver.h')
-rw-r--r--indra/llcommon/llversionserver.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index b79c729184..de2cbde0e1 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -34,8 +34,8 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 24;
-const S32 LL_VERSION_PATCH = 6;
-const S32 LL_VERSION_BUILD = 94536;
+const S32 LL_VERSION_PATCH = 7;
+const S32 LL_VERSION_BUILD = 97877;
const char * const LL_CHANNEL = "Second Life Server";