graffy76 f87eb67968 Fixed conflicts ...

Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp

2013-06-17 06:45:44 -05:00

..

filedialog.cpp

Implemented a file dialog for the editor using launcher .ui

2013-03-07 03:00:59 +01:00

filedialog.hpp

Implemented a file dialog for the editor using launcher .ui

2013-03-07 03:00:59 +01:00

opendialog.cpp

Issue #567: workaround for crash with non-English ESX files

2013-02-17 19:26:01 +01:00

opendialog.hpp

Upload missing files.

2013-02-02 18:36:01 +01:00

operation.cpp

Operations widget height fix and abort button feature. Successfully

2013-02-22 21:53:32 -06:00

operation.hpp

Operations widget height fix and abort button feature. Successfully

2013-02-22 21:53:32 -06:00

operations.cpp

Merge branch 'master' into saveOnClose

2013-03-02 09:24:42 -06:00

operations.hpp

Operations widget height fix and abort button feature. Successfully

2013-02-22 21:53:32 -06:00

startup.cpp

update for master

2013-05-07 20:33:42 -05:00

startup.hpp

added provisional startup dialogue

2013-02-02 16:14:58 +01:00

subview.cpp

Fixed / implemented missing features for RecordStatusDelegate

2013-06-15 06:40:18 -05:00

subview.hpp

Fixed / implemented missing features for RecordStatusDelegate

2013-06-15 06:40:18 -05:00

subviewfactory.cpp

rewrote subview factory system

2012-12-11 13:22:43 +01:00

subviewfactory.hpp

rewrote subview factory system

2012-12-11 13:22:43 +01:00

subviewfactoryimp.hpp

rewrote subview factory system

2012-12-11 13:22:43 +01:00

view.cpp

Fixed conflicts

2013-06-17 06:45:44 -05:00

view.hpp

Fixed / implemented missing features for RecordStatusDelegate

2013-06-15 06:40:18 -05:00

viewmanager.cpp

Fixed / implemented missing features for RecordStatusDelegate

2013-06-15 06:40:18 -05:00

viewmanager.hpp

Fixed / implemented missing features for RecordStatusDelegate

2013-06-15 06:40:18 -05:00