From 57be416ab7c9d93196231fb55de8ba563f3b29eb Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Fri, 2 Feb 2007 18:05:29 +0000 Subject: svn merge -r 57502:57551 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 svn merge -r 57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 (skips 57565, a merge from release. being picky.) Pick up fixes for: * Offer Teleport in profiles * Setting 'none' group * agni_check_parcel_auctions exception (pushed live already) --- indra/newview/English.lproj/InfoPlist.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/English.lproj') diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 6ef64e4b4b..66ce415541 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 1.13.3.2"; -CFBundleGetInfoString = "Second Life version 1.13.3.2, Copyright 2004-2006 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.13.3.3"; +CFBundleGetInfoString = "Second Life version 1.13.3.3, Copyright 2004-2006 Linden Research, Inc."; -- cgit v1.2.3