# 
# 
# patch "ChangeLog"
#  from [b997b7d8f4e8dd10e35689e6403e692ab422f71f]
#    to [4f0c0fea754020ac5fc0b1dbc85ee711164ff748]
# 
============================================================
--- ChangeLog	b997b7d8f4e8dd10e35689e6403e692ab422f71f
+++ ChangeLog	4f0c0fea754020ac5fc0b1dbc85ee711164ff748
@@ -9,6 +9,38 @@
 
 2006-04-08  Nathaniel Smith  <address@hidden>
 
+	* NEWS: Finish paragraph that stopped in the
+
+2006-04-08  Nathaniel Smith  <address@hidden>
+
+	* configure.ac, debian/changelog, win32/monotone.iss: 
+	* monotone.spec: Bump version number to 0.26.
+	* NEWS: Insert release time.
+
+2006-04-08  Timothy Brownawell  <address@hidden>
+
+	* commands.cc (process_netsync_args): fix crash when calling netsync
+	with an --exclude but no include argument.
+	* tests/t_netsync_no_include.at: netsync with --exclude but no
+	include should E(), not I().
+	* testsuite.at: call it
+
+2006-04-08  Nathaniel Smith  <address@hidden>
+
+	* monotone.texi: Several little content improvements, scattered
+	throughout.
+	(Automation): Document new rev and manifest formats.  Document new
+	packet commands.
+	* database_check.cc: Add a comment to warn people that there are
+	detailed docs on this, so if they add new stuff they'll want to
+	add new docs too.
+	* automate.cc (automate_get_manifest_of, automate_get_revision):
+	Re-sync docs to manual.
+	(automate_packet_for_fdata): Fix copy/paste error in error
+	message.
+
+2006-04-08  Nathaniel Smith  <address@hidden>
+
 	* netxx/resolve_gethostbyname.cxx (resolve_hostname): #ifdef out
 	Win32-incompatible error reporting call.