baldurk f04b72ba07 Add missing \s from merge conflict

2015-07-10 16:38:18 +02:00

..

3rdparty/toolwindowmanager

Include ToolWindowManager for Qt docking implementation

2015-07-10 16:38:17 +02:00

EventBrowser.cpp

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

EventBrowser.h

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

EventBrowser.ui

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

main.cpp

rename mainwindow to MainWindow

2015-07-10 16:38:16 +02:00

MainWindow.cpp

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

MainWindow.h

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

MainWindow.ui

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

qrenderdoc.pro

Add missing \s from merge conflict

2015-07-10 16:38:18 +02:00

TextureViewer.cpp

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

TextureViewer.h

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00

TextureViewer.ui

Placeholder event browser and texture viewer windows, for testing

2015-07-10 16:38:18 +02:00