summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-20 12:41:00 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-20 12:41:00 +0100
commitf33fff7e15947859f9c89cd5297971a28205bca8 (patch)
tree4abe6618d6bc69432707f23369587190d1ef544d /indra/llcommon
parente275b7a658ee29ca4ce3dd77908ddd4c34749449 (diff)
parent5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff)
slightly hairy merge from viewer-trunk
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 3ab4257fab..fc9fcb2d9e 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 0;
-const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 203110;
const char * const LL_CHANNEL = "Second Life Developer";