Merge branch 'master' into login_browser
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
commit6a032ca1d871100c07c9679b547c66a6c13d8622
tree2b0bcc8101655171e993431cc5baa13bec19f02d
parent3bd75059b39c48806f58a116ac447c3f5fc46833
parent80dc98b02351c27cc877de43fe4ea6580c14fdf3
Merge branch 'master' into login_browser
src/ui/locationsearchpanel.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h