From 6d2c503f6132ed9cdb43f5e0e4e977eff31618a4 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 28 Aug 2007 21:19:20 +0000
Subject: svn merge -r 68474:68690
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer -->
 release

Sync up fixes, version numbers, and release notes applied to the viewer 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 6d5e4610f4..c952ad47f8 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -11,8 +11,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_BUILD = 2;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
-- 
cgit v1.2.3