From: tanya <tanyshk@gmail.com>
Date: Thu, 2 Sep 2010 13:53:05 +0000 (+0300)
Subject: Merge branch 'fifteen'
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=93b1c83344e24315247974d3f1c556036ad2de49;p=livewp

Merge branch 'fifteen'
---

93b1c83344e24315247974d3f1c556036ad2de49
diff --cc applet/data/Makefile.am
index e7fd8a7,24a8b68..48cab8b
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@@ -78,10 -75,9 +81,11 @@@ EXTRA_DIST = $(berlintheme_DATA) 
  	     $(moderntheme_DATA) \
  	     $(matrixtheme_DATA) \
  	     $(acceltheme_DATA) \
+ 	     $(fifteentheme_DATA) \
  	     $(videotheme_DATA) \
  	     $(xshowtheme_DATA) \
 +	     $(conkytheme_DATA) \
 +	     $(colorfloodtheme_DATA) \
  	     $(externaltheme_DATA) \
  	     $(dbus_service_DATA)