summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-04-21 11:44:48 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-04-21 11:44:48 -0700
commit77791a88a9811f71cc9af668d28a903645436be0 (patch)
treea3327810a1e9ac57681e9cf0fdc627dcd168a0a9 /indra/llcommon
parent970b3a7f28c2f1a611410cb8738d17800949b1bd (diff)
parentda3c0658de4b6e7ab645b718927e9b10fd612b01 (diff)
Merge madness
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 bd6df962a1..df5afcbf1c 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 = 5;
+const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";