summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:49:03 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:49:03 -0400
commit17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (patch)
treed57dc022d32f0a5c362860add8c697cddbd6842e /indra/llcommon
parenta024493c04aea26b523d52971ab9cc1c9df5d08b (diff)
parentd27a695b0be6c16e11a8c06c23d59e4107523ef6 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/llcommon')
-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 7d5afe92dc..117d96ffa6 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 = 6;
-const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";