diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
commit | 7ffa6ba854392d5c37de8631c7f35edeed375a58 (patch) | |
tree | 8ca3d2ff39b8ec870ebdf264bf7a26a67f7df624 /indra/llcommon/llversionviewer.h | |
parent | ba60e0906549840b8632d72f17b3f9bcda65e882 (diff) | |
parent | e61da057397f95e0dcf8bf964e2836d3d4a80c20 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index ef55cfec89..e4ad7f4f54 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 = 0; -const S32 LL_VERSION_PATCH = 5; +const S32 LL_VERSION_MINOR = 1; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |