Merged and resolved conflict
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 19 Apr 2010 12:55:48 +0000 (15:55 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 19 Apr 2010 12:55:48 +0000 (15:55 +0300)
commitf2513e68868cd516e55c2fe6a63ca6e148fe191a
tree9603378a36c1b780be4ea848a42719d60b278b48
parent34b6f94fe1681c8777f2314a5d6f66193f932fbf
parentc998596a681c09f2b9c01111be1aacd44d712c47
Merged and resolved conflict
Merge branch 'lampehe' into wallika-own

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