diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-20 18:12:32 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-20 18:12:32 +0000 |
commit | da3c0658de4b6e7ab645b718927e9b10fd612b01 (patch) | |
tree | 26c4faeb3f0818e4bbacf5579e3360f9790b2335 /indra/llcommon | |
parent | ee2cea657ad54643f19f1ced42deecd628a59e1b (diff) | |
parent | 76f24589cd7168099cbffee358835e5489c961cf (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index bd6df962a1..df5afcbf1c 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 = 5; +const S32 LL_VERSION_PATCH = 6; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |