From f04b72ba071b325b2e6db5d10a39db849ac98f40 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 25 Mar 2015 19:11:21 +0000
Subject: [PATCH] Add missing \s from merge conflict

---
 qrenderdoc/qrenderdoc.pro | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
index d6f7a394f..8410045fc 100644
--- a/qrenderdoc/qrenderdoc.pro
+++ b/qrenderdoc/qrenderdoc.pro
@@ -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