# 
# patch "ChangeLog"
#  from [26d654047b7b3194e45dd7f238d29bbc1eeb1783]
#    to [b4b53a8c41889d9598ea8c4785df5312b8aa119f]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,14 @@
+2005-04-28  Emile Snyder  <address@hidden>
+
+	* commands.cc: New command "annotate"
+	* annotate.{cc,hh}: New files implement it.
+	* Makefile.am: Build it.
+	* monotone.texi: Document it.	
+	* tests/t_annotate.at:
+	* tests/t_annotate_add_collision.at:
+	* tests/t_annotate_branch_collision.at: 
+	* testsuite.at: Test it.
+	
 2005-04-21  Jeremy Cowgar  <address@hidden>
 
 	* commands.cc: Renamed maybe_show_multiple_heads to