Merge branch 'master' into separate_search_panel

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 1063753..1cf0da4 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -81,6 +81,7 @@ SOURCES += main.cpp \
     ui/routewaypointlistitem.cpp \
     ui/routewaypointlistview.cpp \
     user/user.cpp \
+    ui/locationsearchpanel.cpp \
     ui/textmodifier.cpp
 HEADERS += application.h \
     common.h \
@@ -164,6 +165,7 @@ HEADERS += application.h \
     ui/routewaypointlistitem.h \
     ui/routewaypointlistview.h \
     user/user.h \
+    ui/locationsearchpanel.h \
     ui/textmodifier.h
 QT += network \
     webkit