Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

12 years ago · 44ea8fe6c9
parent fb071d5e37 9c3801cc67
commit 44ea8fe6c9
47 changed files with 10 additions and 2 deletions
--- a/src/macosx/Info.plist
+++ b/src/macosx/Info.plist
@ -7,7 +7,7 @@
 		<key>CFBundleDisplayName</key>
 		<string>Kiwix</string>
 		<key>CFBundleGetInfoString</key>
-		<string>0.9 rc3</string>
+		<string>0.9</string>
 		<key>CFBundleIconFile</key>
 		<string>kiwix.icns</string>
 		<key>CFBundleIdentifier</key>
@ -19,7 +19,7 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.9 rc3</string>
+		<string>0.9</string>
 		<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 		<key>CFBundleSignature</key>
--- a/src/macosx/icons/KIWIX-icon-1024-128.png
+++ b/src/macosx/icons/KIWIX-icon-1024-128.png
--- a/src/macosx/icons/KIWIX-icon-1024-128@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024-128@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024-16.png
+++ b/src/macosx/icons/KIWIX-icon-1024-16.png
--- a/src/macosx/icons/KIWIX-icon-1024-16@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024-16@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024-256.png
+++ b/src/macosx/icons/KIWIX-icon-1024-256.png
--- a/src/macosx/icons/KIWIX-icon-1024-256@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024-256@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024-32.png
+++ b/src/macosx/icons/KIWIX-icon-1024-32.png
--- a/src/macosx/icons/KIWIX-icon-1024-32@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024-32@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024-512.png
+++ b/src/macosx/icons/KIWIX-icon-1024-512.png
--- a/src/macosx/icons/KIWIX-icon-1024-512@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024-512@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024.icns
+++ b/src/macosx/icons/KIWIX-icon-1024.icns
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_128x128.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_128x128.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_128x128@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_128x128@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_16x16.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_16x16.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_16x16@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_16x16@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_256x256.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_256x256.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_256x256@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_256x256@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_32x32.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_32x32.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_32x32@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_32x32@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_512x512.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_512x512.png
--- a/src/macosx/icons/KIWIX-icon-1024.iconset/icon_512x512@2x.png
+++ b/src/macosx/icons/KIWIX-icon-1024.iconset/icon_512x512@2x.png
--- a/src/macosx/icons/KIWIX-icon-1024/Icon
+++ b/src/macosx/icons/KIWIX-icon-1024/Icon
--- a/src/macosx/icons/KIWIX-icon-zim-1024-128.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-128.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-128@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-128@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-16.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-16.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-16@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-16@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-256.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-256.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-256@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-256@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-32.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-32.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-32@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-32@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-512.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-512.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024-512@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024-512@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.icns
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.icns
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_128x128.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_128x128.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_128x128@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_128x128@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_16x16.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_16x16.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_16x16@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_16x16@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_256x256.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_256x256.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_256x256@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_256x256@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_32x32.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_32x32.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_32x32@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_32x32@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_512x512.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_512x512.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_512x512@2x.png
+++ b/src/macosx/icons/KIWIX-icon-zim-1024.iconset/icon_512x512@2x.png
--- a/src/macosx/icons/KIWIX-icon-zim-1024/Icon
+++ b/src/macosx/icons/KIWIX-icon-zim-1024/Icon
--- a/src/macosx/icons/kiwix-icons.iconsproj
+++ b/src/macosx/icons/kiwix-icons.iconsproj
--- a/src/macosx/kiwix.entitlements
+++ b/src/macosx/kiwix.entitlements
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
 		<key>com.apple.security.app-sandbox</key>
 		<true/>
 	</dict>
 </plist>