Merge branch 'qtcreatorpackaging'
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Sun, 14 Aug 2011 13:28:48 +0000 (16:28 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Sun, 14 Aug 2011 13:28:48 +0000 (16:28 +0300)
commit89474218e4e7d3574c1c77da18be8b8180b149cd
tree3e7042a59f8b8bba1b51cb5a7b665438ab21e9f1
parente3d78d642357c3cbd65564b4784088d548b1ba6a
parent24a90ddae70f4be2ef6f56a7af295b011e37dd3e
Merge branch 'qtcreatorpackaging'

Conflicts:
src/kitchenalert.pro
src/kitchenalert.pro