new version: 2017.1.3

new version: 2017.1.2
Update submodule heads for release/2017.1
2017-04-04 08:59:05 +02:00 · 2017-03-01 20:41:09 +01:00 · 2017-02-22 18:08:22 +01:00 · 2017-02-21 15:23:55 +01:00 · 2017-02-21 15:21:58 +01:00 · 2017-02-21 11:28:53 +01:00
6 changed files with 12 additions and 10 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,19 +1,19 @@
 [submodule "simgear"]
 	path = simgear
 	url = https://git.code.sf.net/p/flightgear/simgear
-	branch = next
+	branch = release/2017.1
 [submodule "flightgear"]
 	path = flightgear
 	url = https://git.code.sf.net/p/flightgear/flightgear
-	branch = next
+	branch = release/2017.1
 [submodule "fgrun"]
 	path = fgrun
 	url = https://git.code.sf.net/p/flightgear/fgrun
 	branch = next
 [submodule "fgdata"]
 	path = fgdata
-	url = https://git.code.sf.net/p/flightgear/fgdata
-	branch = next
+	url = git://git.code.sf.net/p/flightgear/fgdata
+	branch = release/2017.1
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = https://git.code.sf.net/p/flightgear/windows-3rd-party
--- a/FlightGear.iss
+++ b/FlightGear.iss
@ -111,7 +111,9 @@ Source: "{#VCInstallDir}\redist\x64\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}\

 ; 32/64 bits install
 ;NOTE: FGPanel has no 64 bits equivalent, so we are using the 32 bits binary for 32&64 bits OS
-Source: "{#InstallDir32}\bin\fgpanel.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Torsten 2017-02-21: currently no FGPanel due to missing glew dependency
+;Source: "{#InstallDir32}\bin\fgpanel.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+

 ; Include the base package
 #if IncludeData == "TRUE"
@ -209,7 +211,7 @@ Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
 Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
 Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin"
 Name: "{group}\Tools\yasim"; Filename: "cmd"; Parameters: "/k ""{app}\bin\yasim.exe"" -h"; WorkingDir: "{app}\bin"
-Name: "{group}\Tools\fgpanel"; Filename: "cmd"; Parameters: "/k ""{app}\bin\fgpanel.exe"" -h"; WorkingDir: "{app}\bin"
+;Name: "{group}\Tools\fgpanel"; Filename: "cmd"; Parameters: "/k ""{app}\bin\fgpanel.exe"" -h"; WorkingDir: "{app}\bin"
 Name: "{group}\Tools\FGCom"; Filename: "{app}\bin\fgcom.exe"; WorkingDir: "{app}\bin"
 Name: "{group}\Tools\FGCom-testing"; Filename: "{app}\bin\fgcom.exe"; Parameters: "--frequency=910"; WorkingDir: "{app}\bin"
 Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6a3316ebd8be4c31c630c8e3d8e4a32d3d08644f
+Subproject commit 9dc91304b47c0f5aa7913c7888713dc52fdeab0c
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9aaff777d9065052530e9a00044f0e92db43cedf
+Subproject commit 19fc9527ad711cf9e87d3036c4c7d511adafd3e9
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 86fb1ed00fdd23e3df60da64f9b03111a774c636
+Subproject commit 2b4e5a71df948fb2b52b38b6fcf7a89a42bcd0be
--- a/2
+++ b/2
@ -1 +1 @@
-2017.1.0
+2017.1.3
Author	SHA1	Message	Date
Automatic Release Builder	1949900359	new version: 2017.1.3	2017-04-04 08:59:05 +02:00
Automatic Release Builder	d3d16d122b	new version: 2017.1.2	2017-03-01 20:41:09 +01:00
Automatic Release Builder	16dd404983	Update submodule heads for release/2017.1	2017-02-22 18:08:22 +01:00
Automatic Release Builder	c4f6efe18f	There is also no fgpanel icon	2017-02-21 15:23:55 +01:00
Automatic Release Builder	c4af97e4f7	Disable fgpanel for windows due to missing glew dependency	2017-02-21 15:21:58 +01:00
Automatic Release Builder	7431c6253f	desperate attempt to get fgdata cloned	2017-02-21 11:28:53 +01:00
Automatic Release Builder	f98d36ab3a	set correct release-branch for submodules	2017-02-20 18:52:19 +01:00
 @ -1 +1 @@
 .1.0
 .1.3