summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-10-16 21:02:48 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-10-16 21:02:48 -0400
commitc370313676451f6e5cfd72bec314ad79bc653833 (patch)
tree1bd99330b482d828f8edc71691d177078123fd1e /indra/llcommon/llversionviewer.h
parent988767d5ec4631ad9f0099180a92c4f186553940 (diff)
parentf2e2ea99a351ca8663af460974137545d020b97f (diff)
Automated merge with file:///Users/nat/linden/viewer-sourceid
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-rw-r--r--indra/llcommon/llversionviewer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 22d0aba51b..bcc661a920 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,8 +28,8 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 3;
-const S32 LL_VERSION_MINOR = 3;
-const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_MINOR = 4;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";