# HG changeset patch
# User Dongsheng Song <songdongsheng@live.cn>
# Date 1242896988 -28800
# Node ID c3863298abc78debc074e85394bb5126c4392210
# Parent  eb4381bae2f209785a7776b90c60c57f4eefd868
Sync Makefile with the source

diff -r eb4381bae2f2 -r c3863298abc7 Makefile
--- a/Makefile	Thu May 21 16:57:06 2009 +0800
+++ b/Makefile	Thu May 21 17:09:48 2009 +0800
@@ -23,6 +23,11 @@
 rev_id = $(shell hg parents --template '{node|short} ({date|shortdate})')
 
 images := \
+	en/figs/bad-merge-1.png \
+	en/figs/bad-merge-2.png \
+	en/figs/bad-merge-3.png \
+	en/figs/bad-merge-4.png \
+	en/figs/bad-merge-5.png \
 	en/figs/feature-branches.png \
 	en/figs/filelog.png \
 	en/figs/metadata.png \
@@ -59,6 +64,12 @@
 clean:
 	@rm -fr build po/*.mo hello en/hello en/html en/.validated-00book.xml en/examples/.run en/examples/results \
           stylesheets/system-xsl en/figs/*-tmp.svg \
+          web/index-read.html.in \
+          en/figs/bad-merge-1.png \
+          en/figs/bad-merge-2.png \
+          en/figs/bad-merge-3.png \
+          en/figs/bad-merge-4.png \
+          en/figs/bad-merge-5.png \
           en/figs/feature-branches.png \
           en/figs/filelog.png \
           en/figs/feature-branches.png \