summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 10:18:03 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 10:18:03 -0400
commit458a063c7519b48fe3b90dd7e122317bf17d4fff (patch)
treeb001a3d71f514966693c2ef4faf919f21d291079 /indra/llcommon
parentabffd7aa4f81d77f4816e4134ba7eea2a5f66f58 (diff)
parent25b69823e6a29e21310ada2961dd4bbe08756f55 (diff)
Automated merge with file:///Users/oz/Work/V-PB
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";