| commit | a308e255f5018f7ec00cf1a7527a899a73410454 | |
| author | keldorkatarn <schmitta79@gmail.com> | |
| Mon, 7 May 2018 09:52:15 +0000 (7 11:52 +0200) | ||
| committer | keldorkatarn <schmitta79@gmail.com> | |
| Mon, 7 May 2018 09:52:15 +0000 (7 11:52 +0200) | ||
| tree | 9bbe9bc33b8fcb4ffc32bc50a3b51254c228a407 | treesnapshot (tar.gz zip) |
| parent | 8097b80be777ef2cbd2fb56de0da3da4fc7ccaa0 | commitdiff |
| parent | 2ab5d2aa0d9021ad187265f55485d6d4ebdcc1a2 | commitdiff |
Merge branch 'development' into feature/road_and_tram_types
# Conflicts:
# src/saveload/saveload.cpp
# Conflicts:
# src/saveload/saveload.cpp