From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 31 Jul 2011 21:01:27 +0000 (+0200)
Subject: Merge branch 'master' into config
X-Git-Tag: v3.2~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=557e02701794a3d8c23450c07280d93295be658d;p=thirdparty%2Fccache.git

Merge branch 'master' into config

* master:
  Add missing header to header list in dev.mk.in

Conflicts:
	dev.mk.in
---

557e02701794a3d8c23450c07280d93295be658d
diff --cc dev.mk.in
index f9b2f26d4,ebbc97516..af44c0dce
--- a/dev.mk.in
+++ b/dev.mk.in
@@@ -26,7 -25,7 +26,7 @@@ built_dist_files = $(generated_docs
  headers = \
      ccache.h hashtable.h hashtable_itr.h hashtable_private.h hashutil.h \
      manifest.h mdfour.h counters.h murmurhashneutral2.h getopt_long.h \
-     language.h system.h compopt.h conf.h \
 -    language.h system.h compopt.h macroskip.h \
++    language.h system.h compopt.h macroskip.h conf.h \
      test/framework.h test/suites.h test/util.h
  
  files_to_clean += *.tar.bz2 *.tar.gz *.tar.xz *.xml .deps/*