Merge branch 'singleinstance' into harmattan
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 13 Sep 2011 10:49:59 +0000 (13:49 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 13 Sep 2011 10:49:59 +0000 (13:49 +0300)
commitd5e5488e3d56efc0cb080acf9403981fd823a45f
tree3441cbc42cf2917a67e0b4c6d893bd36cf28d5f5
parent928f7bec8b31f6c1cbfbd08c1b79985d0d3abf64
parentbe2d8d46fccb5ac3a9007290427651d01d1f8219
Merge branch 'singleinstance' into harmattan

Single instance works.

Conflicts:
ghostsoverboard.desktop
ghostsoverboard.pro
ghostsoverboard.pro