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)
Conflicts:
src/kitchenalert.pro


No differences found