Merge branch 'master' into indicator
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Thu, 22 Jul 2010 07:06:25 +0000 (10:06 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Thu, 22 Jul 2010 07:06:25 +0000 (10:06 +0300)
commit748d3f799acfd8fb3933264e9d1e9ae50547caa8
tree7a155a55306728b1eb1f455d419fb0042b45c822
parente4f217da17ad0546055c05005bd6abeebc4ab5b0
parent17d73227ed23b15fb71856c32d5bd706afc16386
Merge branch 'master' into indicator

Conflicts:
src/engine/engine.cpp
src/src.pro
src/ui/mainwindow.h
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/userinfopanel.h