Merged revisions 32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033,33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33185

7 files changed, 34 insertions, 6 deletions

diff --git a/dists/msvc7/parallaction.vcproj b/dists/msvc7/parallaction.vcproj
index 79ac169995..9dfb575c6b 100644
--- a/dists/msvc7/parallaction.vcproj
+++ b/dists/msvc7/parallaction.vcproj
@@ -97,6 +97,9 @@
 	</Configurations>
 	<Files>
 		<File
+			RelativePath="..\..\engines\parallaction\balloons.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\callables_br.cpp">
 		</File>
 		<File
@@ -124,6 +127,9 @@
 			RelativePath="..\..\engines\parallaction\disk_ns.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\exec.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\exec_br.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/parallaction.vcproj b/dists/msvc71/parallaction.vcproj
index 440e7123e8..6030b030a8 100644
--- a/dists/msvc71/parallaction.vcproj
+++ b/dists/msvc71/parallaction.vcproj
@@ -111,6 +111,9 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\parallaction\balloons.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\callables_br.cpp">
 		</File>
 		<File
@@ -138,6 +141,9 @@
 			RelativePath="..\..\engines\parallaction\disk_ns.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\exec.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\exec_br.cpp">
 		</File>
 		<File
diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj
index 21a6d3bab3..c5721bd30f 100644
--- a/dists/msvc8/parallaction.vcproj
+++ b/dists/msvc8/parallaction.vcproj
@@ -161,6 +161,10 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\parallaction\balloons.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\callables_br.cpp"
 			>
 		</File>
@@ -197,6 +201,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\exec.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\exec_br.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/parallaction.vcproj b/dists/msvc9/parallaction.vcproj
index bdc93860f9..d3117b6b0c 100644
--- a/dists/msvc9/parallaction.vcproj
+++ b/dists/msvc9/parallaction.vcproj
@@ -162,6 +162,10 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\parallaction\balloons.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\callables_br.cpp"
 			>
 		</File>
@@ -198,6 +202,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\exec.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\exec_br.cpp"
 			>
 		</File>
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index efde789ce3..1d3b2bce64 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 0.12.0svn
+Version		: 0.13.0svn
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 73763a1216..0fb2b87071 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -7,8 +7,8 @@ IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,12,0,0
- PRODUCTVERSION 0,12,0,0
+ FILEVERSION 0,13,0,0
+ PRODUCTVERSION 0,13,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "0.12.0svn\0"
+            VALUE "FileVersion", "0.13.0svn\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2007 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "0.12.0svn\0"
+            VALUE "ProductVersion", "0.13.0svn\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 415ee4c867..6ed0ed6e57 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -8,7 +8,7 @@ if [ "$TMP" = "" ]; then
 fi
 PKG=$TMP/package-scummvm
 
-VERSION=0.12.0svn
+VERSION=0.13.0svn
 ARCH=i486
 BUILD=1