Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed last warning on GCC 4.7.1. Also updated the branding text on the Win32 installer script.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5585 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2012-12-21 10:19:18 +00:00
parent a471ada1f6
commit 04ab3b3eb4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installers/win32/OOlite.nsi
View File

@ -50,7 +50,7 @@ SetCompressor LZMA
SetCompressorDictSize 32
SetDatablockOptimize on
OutFile "${OUTDIR}\OoliteInstall-${VER}${EXTVER}.exe"
BrandingText "(C) 2003-2011 Giles Williams and contributors"
BrandingText "(C) 2003-2012 Giles Williams, Jens Ayton and contributors"
Name "Oolite"
Caption "Oolite ${VER}${EXTVER} Setup"
SubCaption 0 " "
@ -70,7 +70,7 @@ SetOverwrite on
VIAddVersionKey "ProductName" "Oolite"
VIAddVersionKey "FileDescription" "A space combat/trading game, inspired by Elite."
VIAddVersionKey "LegalCopyright" "© 2003-2011 Giles Williams and contributors"
VIAddVersionKey "LegalCopyright" "© 2003-2012 Giles Williams, Jens Ayton and contributors"
VIAddVersionKey "FileVersion" "${VER}"
!ifdef SNAPSHOT
VIAddVersionKey "SVN Revision" "${SVNREV}"

2
src/Core/Debug/OOJSConsole.m
View File

@ -834,7 +834,7 @@ static JSBool ConsoleIsExecutableJavaScript(JSContext *context, uintN argc, jsva
OOJSResumeTimeLimiter();
OOJS_RETURN_BOOL(YES);
OOJS_RETURN_BOOL(result);
OOJS_NATIVE_EXIT
}