summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-11-27 16:33:31 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-11-27 16:33:31 -0500
commit10923b838a8990cfb05d79c8d9dd503e713a3077 (patch)
tree77708b6eb327b5e499af6104faff9a467094846d
parent61b167106a3a12e081e9a6378ce7d1abc2ae228c (diff)
parentea262045fbf26c153e6e4c46b5b67ad296cda8c1 (diff)
Merge ../twentyeleven-child
-rw-r--r--Makefile1
-rw-r--r--theme.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b17979b..7df9dba 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ PNGCRUSH = $(firstword $(call pathsearch,pngcrush) $(call pathsearch,cp))
default: all
include theme.mk
+srcfiles += twentyeleven-fix.scss license.txt
srcfiles += .gitignore theme.mk Makefile
all: .gitignore $(targets)
diff --git a/theme.mk b/theme.mk
index 1dd69ee..19dcd8d 100644
--- a/theme.mk
+++ b/theme.mk
@@ -1,6 +1,4 @@
srcfiles = \
- license.txt \
- twentyeleven-fix.scss \
style.scss \
functions.php \
screenshot.png \