Skip to content
Snippets Groups Projects
Commit 8fde5f0d authored by Christian Goetze's avatar Christian Goetze
Browse files

svn merge -r74912:76207 svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Server -> release

parent 6c6987e8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llcommon/llversionserver.h
+ 1
− 1
View file @ 8fde5f0d
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 6; const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 74522; const S32 LL_VERSION_BUILD = 76205;
const char * const LL_CHANNEL = "Second Life Server"; const char * const LL_CHANNEL = "Second Life Server";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment