Merge branch 'own_location' into integration
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 11:37:25 +0000 (14:37 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 11:37:25 +0000 (14:37 +0300)
commitd13c207f0754f5a1311aeb0ee130311a99380ef7
tree8d4c50e22e5c8cbd4e74a8079b115b0da86c9837
parent720ba73ca082116b174a1067d8b60fcee69e03db
parentadf8a4d8c24d249cffe2e86589048d6e2f04ec8e
Merge branch 'own_location' into integration

Conflicts:
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mainwindow.cpp