David Cernat 1a8a518897 Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: README.md apps/openmw-mp/Script/Functions/World.cpp apps/openmw/mwmp/LocalPlayer.cpp apps/openmw/mwmp/LocalPlayer.hpp apps/openmw/mwworld/scene.cpp components/openmw-mp/Version.hpp		2018-01-29 02:57:48 +02:00
..
launcher
mac
mygui	[General] Introduce chat channels	2017-12-08 07:43:29 +08:00
opencs
shaders
tes3mp	[Browser] Disable connect button by default	2018-01-11 20:35:37 +08:00
ui
windows
wizard
CMakeLists.txt
gamecontrollerdb.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
gamecontrollerdb_204.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
gamecontrollerdb_205.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
openmw-cs.cfg
openmw-cs.desktop
openmw.appdata.xml	update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html	2018-01-01 19:47:36 +01:00
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg	Merge pull request #1580	2018-01-11 01:54:28 +00:00
tes3mp-browser.desktop
version.in