From 39affbc54410569eb5694f30d10b9edd591f0f5f Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Fri, 29 Feb 2008 01:18:00 +0000 Subject: svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer * Respect pre-1.19.0 voice settings * Re-fix DEV-11213 "SECURITY: Web site can use IFRAME to launch SL and steal your password" --- indra/newview/English.lproj/InfoPlist.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/English.lproj/InfoPlist.strings') diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 7ecd693ba4..608a6ad733 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.19.0.4"; -CFBundleGetInfoString = "Second Life version 1.19.0.4, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.19.0.5"; +CFBundleGetInfoString = "Second Life version 1.19.0.5, Copyright 2004-2007 Linden Research, Inc."; -- cgit v1.2.3