From 75daa1287293740d9feea14e012ca9203ac9f006 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 27 Nov 2007 19:48:41 +0000
Subject: [PATCH] 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.
---
 indra/llcommon/llversionserver.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 8a2f8835f52..d6e8a5ccfb8 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -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";
 
-- 
GitLab