summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-09-09 11:43:35 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-09-09 11:43:35 -0400
commit9c5cc00998e240f4bc6061830a162e3daa1d2f81 (patch)
tree08288ab4caf6670105de119d7d6a415b69360e8b /indra/llcommon
parent5669597e1803f24ee2ea452a792ecf35deffaee8 (diff)
parent11d10bd53aa14a7a18ffb40a5195e95f4e108c21 (diff)
Merged parabuild work and trunk with nat's latest linux linkage and LSL tests fixes.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionserver.h2
-rw-r--r--indra/llcommon/llversionviewer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 23e39ceb08..e9e21cffb6 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 29;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2425;
const char * const LL_CHANNEL = "Second Life Server";
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 45810a101d..04cf98ce19 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 0;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2425;
const char * const LL_CHANNEL = "Second Life 2009";