From 181bf2ba8efa49d3a2456cf5cc68537e39d387dd Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Thu, 30 Jul 2009 01:19:13 +0000 Subject: Bump trunk version to 1.31 --- indra/llcommon/llversionserver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/llversionserver.h') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index c0fc06ee6e..a2c1819d8d 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,9 +34,9 @@ #define LL_LLVERSIONSERVER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 29; +const S32 LL_VERSION_MINOR = 31; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 120909; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3 From 89de8e5b552b997335a429ad41f86e4200441b11 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Mon, 31 Aug 2009 13:26:35 -0700 Subject: Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now. --- indra/llcommon/llversionserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/llversionserver.h') 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"; -- cgit v1.2.3 From 9a8042d5a3edfd07727793a1939c3ab361ceec9a Mon Sep 17 00:00:00 2001 From: CG Linden Date: Sun, 13 Sep 2009 15:32:28 -0700 Subject: Adapt the build script so it can be invoked from a developer checkout. --- indra/llcommon/llversionserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/llversionserver.h') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index f073bd327b..77a03879bf 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 = 31; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 2425; +const S32 LL_VERSION_BUILD = 2639; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3 From 422b9c5872f15b3d0a6e40472a8e528d7d94df5f Mon Sep 17 00:00:00 2001 From: CG Linden Date: Wed, 16 Sep 2009 21:50:40 -0700 Subject: Relocate build.sh to the top of the source tree. --- indra/llcommon/llversionserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/llversionserver.h') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index e9e21cffb6..72247206da 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 = 2425; +const S32 LL_VERSION_BUILD = 2822; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3 From 050ae3cf5107140a58f6aeae865d254b74a23d44 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 15 Oct 2009 15:43:59 -0400 Subject: Merge up to latest viewer/viewer-2-0 --- indra/llcommon/llversionserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/llversionserver.h') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index aee7c6ee1e..71c6fc0591 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 = 31; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 2822; +const S32 LL_VERSION_BUILD = 3256; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3