Permalink
Browse files

Merge branch 'master' into next

Conflicts:
	cheetah/Version.py

Change-Id: I90bb7469ef5fedbd07c28804fb13c4a818b121a4
  • Loading branch information...
2 parents a195750 + a28fcc7 commit 7ab7f51887f448e808dd401e1c89dd6c61f604ad @rtyler committed Mar 1, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 MANIFEST.in
View
@@ -1,5 +1,5 @@
include MANIFEST.in *.py *.cfg TODO CHANGES LICENSE README.markdown examples docs bin
-recursive-include cheetah *.py *.tmpl *.txt
+recursive-include cheetah *.py *.tmpl *.txt *.h
recursive-include bin *
recursive-include docs *
recursive-include examples *

0 comments on commit 7ab7f51

Please sign in to comment.