From 0f00eef21798520bcfe27ae03b3f1b2ae938ff13 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 1 Nov 2007 23:10:05 +0000
Subject: svn merge -r 71509:72877
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer -->
 release

Backport patches and translations from RC branch
---
 indra/llcommon/llversionviewer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 300d34b735..c13155aeb5 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.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 = 5;
+const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_BUILD = 2;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
-- 
cgit v1.2.3