Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Mon, 10 May 2010 10:19:12 +0000 (13:19 +0300)
committerVlad <vlad@gas.by>
Mon, 10 May 2010 10:19:12 +0000 (13:19 +0300)
commit9fd68e7874dc9b13f394efc84a3d515e08ad7357
tree9a06b86a67a52414aefd8c6fa5cdd1c6b903a904
parentadb7b923f9fd22f7a12be592af299d312f59112b
parent7c38c73599dc4d6c5ec31b6ef5276ec2115ee4f5
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:
applet/src/livewp-home-widget.c
applet/src/livewp-common.h
applet/src/livewp-home-widget.c
applet/src/livewp-scene.c