Skip to content
Snippets Groups Projects
Commit 75daa128 authored by Josh Bell's avatar Josh Bell
Browse files

svn merge -r 72903:73200...

svn merge -r 72903:73200 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release

Missed merge range in release r74199. Josh is an idiot.
parent ecc4b297
No related branches found
No related tags found
No related merge requests found
......@@ -34,8 +34,8 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_BUILD = 72163;
const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 73054;
const char * const LL_CHANNEL = "Second Life Server";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment