git Merge branch 'search_item'
authorlampehe-local <henri.lampela@ixonos.com>
Tue, 27 Jul 2010 10:14:17 +0000 (13:14 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Tue, 27 Jul 2010 10:14:17 +0000 (13:14 +0300)
commit2fa82199980f0ffd70583ec7ed805bb410dc428c
treefc54c42d03f5deac308ce351f2a71c7b579ad2e5
parent4d6bdbddd489e4935184ffae6365ea64c7f7e481
parent4bd43a357a13f3481144cc056526f0ded8f4a4ff
git Merge branch 'search_item'

Conflicts:
src/engine/engine.cpp
src/ui/mainwindow.cpp
src/engine/engine.cpp
src/routing/routingservice.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h