]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 247f1d6)
Merge remote branch 'refs/remotes/origin/merlijn/osx-logo'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 8 Aug 2010 19:32:46 +0000 (21:32 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 8 Aug 2010 19:32:46 +0000 (21:32 +0200)
misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns patch | blob | history
misc/buildfiles/osx/Xonotic.app/Contents/Resources/Xonotic.icns patch | blob | history
misc/logos/icons_icns/Xonotic.icns [new file with mode: 0644] patch | blob
misc/logos/icons_icns/xonotic.icns [deleted file] patch | blob | history

diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns
index 07cc4f32d9db9bad1211032cd13d7fdee582b763..4129b9fc3259307633ca2d2ca48d65ece3af267b 100644 (file)
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Resources/Xonotic.icns b/misc/buildfiles/osx/Xonotic.app/Contents/Resources/Xonotic.icns
index 07cc4f32d9db9bad1211032cd13d7fdee582b763..4129b9fc3259307633ca2d2ca48d65ece3af267b 100644 (file)
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/Resources/Xonotic.icns and b/misc/buildfiles/osx/Xonotic.app/Contents/Resources/Xonotic.icns differ
diff --git a/misc/logos/icons_icns/Xonotic.icns b/misc/logos/icons_icns/Xonotic.icns
new file mode 100644 (file)
index 0000000..4129b9f
Binary files /dev/null and b/misc/logos/icons_icns/Xonotic.icns differ
diff --git a/misc/logos/icons_icns/xonotic.icns b/misc/logos/icons_icns/xonotic.icns
deleted file mode 100644 (file)
index 95e0209..0000000
Binary files a/misc/logos/icons_icns/xonotic.icns and /dev/null differ