diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-01 21:12:41 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-01 21:12:41 +0100 |
commit | 852de0424f7226dfd61d2779c1ea6413ac85d584 (patch) | |
tree | e902d1e91d760273cb1b1fba4c51cf3232ed6194 /SDLMain.nib/info.nib | |
parent | f19b3786f3f000a84c8080594e398686e0298ca4 (diff) | |
parent | bcd1d9aff41b5c152cafade7532242c94ac1f710 (diff) | |
download | mana-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.gz mana-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.bz2 mana-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.xz mana-852de0424f7226dfd61d2779c1ea6413ac85d584.zip |
Merge branch '0.5'
Conflicts:
po/de.po
src/game.cpp
src/resources/wallpaper.cpp
Diffstat (limited to 'SDLMain.nib/info.nib')
-rw-r--r-- | SDLMain.nib/info.nib | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/SDLMain.nib/info.nib b/SDLMain.nib/info.nib deleted file mode 100644 index a753dd52..00000000 --- a/SDLMain.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ -<?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>IBFramework Version</key> - <string>670</string> - <key>IBLastKnownRelativeProjectPath</key> - <string>themanaworld.xcodeproj</string> - <key>IBOldestOS</key> - <integer>5</integer> - <key>IBOpenObjects</key> - <array> - <integer>29</integer> - </array> - <key>IBSystem Version</key> - <string>9F33</string> - <key>targetFramework</key> - <string>IBCarbonFramework</string> -</dict> -</plist> |