summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-23 19:34:15 -0700
committerRichard Linden <none@none>2011-03-23 19:34:15 -0700
commitfdf63ba0753fcfc17aa6939836c7835787293b3c (patch)
treecd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /indra/llcommon/llversionviewer.h
parent501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff)
parent9c82ea334ab0c1283f28997fe060b24200e3e2be (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-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";