diff options
| author | Alyssa Milburn | 2012-08-28 15:39:00 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-08-28 15:54:12 +0200 |
| commit | 31801137b5c6908edd76f357b3f29b07e9e3be84 (patch) | |
| tree | 33e973717545ae27da6ba4996d0d8fe1bcd437b3 /dists/iphone/Info.plist | |
| parent | 35fd91793b34b72624a89f2a76f45bc8e59020d2 (diff) | |
| parent | 6ab8db638e4a1d547ee67db067b5d6c3d6c940a4 (diff) | |
| download | scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.gz scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.bz2 scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.zip | |
Merge remote-tracking branch 'origin/master' into tony
Conflicts:
common/coroutines.cpp
common/coroutines.h
devtools/create_project/msbuild.cpp
devtools/create_project/visualstudio.cpp
Diffstat (limited to 'dists/iphone/Info.plist')
| -rw-r--r-- | dists/iphone/Info.plist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist index e25cee51ea..2f6ba85b00 100644 --- a/dists/iphone/Info.plist +++ b/dists/iphone/Info.plist @@ -15,11 +15,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.5.0git</string> + <string>1.6.0git</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.5.0git</string> + <string>1.6.0git</string> <key>CFBundleIconFile</key> <string>icon.png</string> <key>CFBundleIconFiles</key> |