krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/components/fileorderlist
History
Pieter van der Kloet ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
2013-02-15 15:21:14 +01:00
..
model Merge remote-tracking branch 'upstream/next' into settingsnext 2013-02-15 15:21:14 +01:00
utils Merge remote-tracking branch 'upstream/next' into settingsnext 2013-02-15 15:21:14 +01:00
datafileslist.cpp Merge remote-tracking branch 'upstream/next' into settingsnext 2013-02-15 15:21:14 +01:00
datafileslist.hpp Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00