update submodule heads

new version: 2016.4.4
new version: 2016.4.3
2016-12-28 14:00:37 +01:00 · 2016-12-28 13:58:32 +01:00 · 2016-12-05 13:31:46 +01:00 · 2016-11-22 09:49:15 +01:00 · 2016-11-21 23:16:06 +00:00 · 2016-11-18 08:52:27 +01:00
7 changed files with 12 additions and 10 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = git://git.code.sf.net/p/flightgear/simgear
-	branch = next
+	branch = release/2016.4
 [submodule "flightgear"]
 	path = flightgear
 	url = git://git.code.sf.net/p/flightgear/flightgear
-	branch = next
+	branch = release/2016.4
 [submodule "fgrun"]
 	path = fgrun
 	url = git://git.code.sf.net/p/flightgear/fgrun
@@ -13,7 +13,7 @@
 [submodule "fgdata"]
 	path = fgdata
 	url = git://git.code.sf.net/p/flightgear/fgdata
-	branch = next
+	branch = release/2016.4
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = git://git.code.sf.net/p/flightgear/windows-3rd-party
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -82,7 +82,8 @@ Name: "insoal"; Description: "Install OpenAL (the sound engine)"
 ; 32 bits install
 Source: "{#InstallDir32}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
-Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
+;locale only exists for fgrun - which has been disabled
 ;Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
@@ -96,7 +97,8 @@ Source: "{#VCInstallDir}\redist\x86\Microsoft.VC140.CRT\*.dll"; DestDir:  "{app}
 ; 64 bits install
 Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
-Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
+;locale only exists for fgrun - which has been disabled
 ;Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
@@ -1 +1 @@
-2016.4.1
+2016.4.4
--- a/2
+++ b/2
Author	SHA1	Message	Date
Automatic Release Builder	25c9516a46	update submodule heads	2016-12-28 14:00:37 +01:00
Automatic Release Builder	2428ee5846	new version: 2016.4.4	2016-12-28 13:58:32 +01:00
Automatic Release Builder	c579c1bf9d	new version: 2016.4.3	2016-12-05 13:31:46 +01:00
Automatic Release Builder	6f16e81aba	new version: 2016.4.2	2016-11-22 09:49:15 +01:00
James Turner	418cf6820e	Update submodule heads.	2016-11-21 23:16:06 +00:00
Torsten Dreyer	1ac4ed1f57	Remove locale folder from install After removal of fgrun, this folder does not exist anymore	2016-11-18 08:52:27 +01:00
Automatic Release Builder	0d1777684d	set correct release-branch for submodules	2016-11-17 13:43:39 +01:00