Index: TODO.txt
===================================================================
RCS file: /projects/pgadmin3/TODO.txt,v
retrieving revision 1.100
retrieving revision 1.101
diff -LTODO.txt -LTODO.txt -u -w -r1.100 -r1.101
--- TODO.txt
+++ TODO.txt
@@ -20,7 +20,6 @@
 		<li>Allow copy/paste of entire rows in the data editor
 		<li>EditGrid: try to show freshly inserted row with 'serial' pk
 		<li>Generate PostgreSQL document indexes using docbook (<a href="http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html">http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html</a>).
-		<li>Add cancel & terminate options to server status dialogue for 7.5.
 	</ul>
 
 	<li>Major Projects
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.110
retrieving revision 1.111
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.110 -r1.111
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,8 @@
 </ul>
 <br>
 <ul>
+    <li>2004-06-23 DP        Split Windows installer into a merge module and installer to allow inclusion in other packages.
+    <li>2004-06-23 DP        Allow cancelling of queries and termination of backends from server status dialogue for 7.5+.
     <li>2004-06-20 AP        backup database using pg_dump
     <li>2004-06-19 AP        Tablespace dependencies
     <li>2004-06-19 AP        combobox guessing cleanups