summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRobert Knop <prospero@lindenlab.com>2008-11-26 23:57:14 +0000
committerRobert Knop <prospero@lindenlab.com>2008-11-26 23:57:14 +0000
commit64cb981d12bf5f1af20aa124c1d645111da96cf0 (patch)
treec89a4fe06b5629b567be9c00b850e36b5dbfd0f6 /indra
parentac68eb16a2dac453fe85b7218297f561b8fc96ca (diff)
Updating version to 1.25.0. Current in 1.25 branch is 1.25.2, but there
are changes in that branch that haven't been merged down into release yet. It makes more sense for things branched from release to be called 1.25 rather than 1.24 now....
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llversionserver.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 425df83c40..aa3d580dc1 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
#define LL_LLVERSIONSERVER_H
const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 24;
-const S32 LL_VERSION_PATCH = 9;
-const S32 LL_VERSION_BUILD = 98650;
+const S32 LL_VERSION_MINOR = 25;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 104413;
const char * const LL_CHANNEL = "Second Life Server";