Petr Mrázek 82225a21e1 Merge branch 'feature_yggdrasil' into develop ...

Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.

2013-11-24 18:41:35 +01:00

3.7 KiB

Raw Blame History

View Raw