Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 29 Mar 2008 14:16:02 +0000 (15:16 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 29 Mar 2008 14:16:02 +0000 (15:16 +0100)
1  2 
.bzrignore
Makefile
branchprops.py
logwalker.py

diff --cc .bzrignore
index 162a08d5e53f7a679bd04212e1e2c965ede50ca2,114a93f4b806877218f0f19f4b582a7bee03c882..f3c9cb2b22d6e6a6d0283004fde17b8ff33e7a18
@@@ -4,12 -4,6 +4,13 @@@ test????.tm
  tags
  apidocs
  .plugins
 +ra.c
 +wc.c
 +core.c
 +ra.h
 +core.h
 +client.c
 +repos.c
  FAQ.html
  README.html
+ AUTHORS.html
diff --cc Makefile
Simple merge
diff --cc branchprops.py
Simple merge
diff --cc logwalker.py
Simple merge