Skip to content

Commit 9b2b3cc

Browse files
committed
Automatic merge of T1.5.1-664-gd39447273 and 7 pull requests
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #865 at 776d6df: Dispatcher window improvements - Pull request #874 at e90cf2b: Dynamic brake controller refactoring - Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #878 at 0b44e34: Implement Polach Adhesion - Pull request #879 at 5a0ff7b: chore: remove Website folder
9 parents cd59350 + d394472 + d00beb9 + 776d6df + e90cf2b + 43bf33e + f92de76 + 0b44e34 + 5a0ff7b commit 9b2b3cc

File tree

220 files changed

+1
-4871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+1
-4871
lines changed

Build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ IF "%Mode%" == "Stable" (
163163
REM Create binary and source zips.
164164
CALL :delete "OpenRails-%Mode%*.zip" || GOTO :error
165165
PUSHD "Program" && 7za.exe a -r -tzip -x^^!*.xml "..\OpenRails-%Mode%.zip" . && POPD || GOTO :error
166-
7za.exe a -r -tzip -x^^!.* -x^^!obj -x^^!lib -x^^!_build -x^^!*.bak -x^^!Website "OpenRails-%Mode%-Source.zip" "Source" || GOTO :error
166+
7za.exe a -r -tzip -x^^!.* -x^^!obj -x^^!lib -x^^!_build -x^^!*.bak "OpenRails-%Mode%-Source.zip" "Source" || GOTO :error
167167

168168
ENDLOCAL
169169
GOTO :EOF

Website/openrails.org/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

Website/openrails.org/banner.jpg

-269 KB
Binary file not shown.

Website/openrails.org/changed-pages/get_changed_pages.php

Lines changed: 0 additions & 45 deletions
This file was deleted.

Website/openrails.org/changed-pages/index.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

Website/openrails.org/changed-pages/index.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

Website/openrails.org/changed-pages/title.php

Lines changed: 0 additions & 1 deletion
This file was deleted.

Website/openrails.org/contact/form.php

Lines changed: 0 additions & 62 deletions
This file was deleted.

Website/openrails.org/contact/index.php

Lines changed: 0 additions & 40 deletions
This file was deleted.

Website/openrails.org/contact/success.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)