fixed conflict merge with master
authortanya <tanyshk@gmail.com>
Wed, 28 Jul 2010 12:23:55 +0000 (15:23 +0300)
committertanya <tanyshk@gmail.com>
Wed, 28 Jul 2010 12:23:55 +0000 (15:23 +0300)
commit7b80a170190ee9f9df6a42d5c4c319e4312c32ff
tree33de7f881193b5a85dbc4543c8e7ef33ddd380b1
parent398a8a68c2d81924e0e321f8ac69bd802428d028
parent8c749fd0286ae49c51c41fe86c6f1f7276246efa
fixed conflict merge with master
applet/data/Makefile.am
applet/src/livewp-home-widget.c
applet/src/livewp-scene.c
applet/src/livewp-scene.h
applet/src/livewp-settings.c