summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-14 14:47:15 -0400
committerOz Linden <oz@lindenlab.com>2011-07-14 14:47:15 -0400
commit54bb91fd03d0c2f2600993274c59ae89324eeb03 (patch)
tree395686190c716ecf9a123610797838ed8b67222e /indra/llcommon/llversionviewer.h
parentdc0765fc3d04bcab9a89bdc8d703f74f09796119 (diff)
parentb48b8ed6484966d33bbe36c31ffc050b7314606a (diff)
merge changes for 2.7.5 release
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 cfafbf0470..92cd9bd46a 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 = 7;
-const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";