lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-20 02:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing \s from merge conflict

Browse Source
This commit is contained in:
baldurk committed 2015-07-10 16:38:18 +02:00
1 parent 1e7a473354
commit f04b72ba07
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/qrenderdoc.pro
+3 -3
View File
@@ -48,20 +48,20 @@ win32 {
}
SOURCES += main.cpp\
MainWindow.cpp
MainWindow.cpp \
3rdparty/toolwindowmanager/ToolWindowManager.cpp \
3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \
3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp \
EventBrowser.cpp \
TextureViewer.cpp
HEADERS += MainWindow.h
HEADERS += MainWindow.h \
3rdparty/toolwindowmanager/ToolWindowManager.h \
3rdparty/toolwindowmanager/ToolWindowManagerArea.h \
3rdparty/toolwindowmanager/ToolWindowManagerWrapper.h \
EventBrowser.h \
TextureViewer.h
FORMS += MainWindow.ui
FORMS += MainWindow.ui \
EventBrowser.ui \
TextureViewer.ui