Index: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO	(revision 15465)
+++ trunk/doc/TODO	(revision 15466)
@@ -66,6 +66,11 @@
 	- export to file 
 	- BUG: DRC hilight: for each drc error, have two groups of objects with different color highlight. SetThing assumes there will be only 1 object; this was broken in the original design [report: Igor2]
 - BUG: revert r15462, get conf_set do this automatically; conf_set_dry will need a create arg [report: igor2]
+- BUG: revert r15464, fix conf merge bug:
+	- the bug is in conf_merge_patch_list() conf.c:607@r15463
+	- if we are adding a prepend list, inserting one by one, going from the first to the last of the list is a bad idea: the prepend list has a1;a2;a3, then we insert them in this order ending up as a3;a2;a1
+	- get the loop go backward if we are in prepend
+- BUG: revert r15465, fix conf merge bug
 - BUG: GL: When a padstack is selected, both the padstack and the padstack mark are drawn in the selection colour. The mark becomes invisible because the GL HID does not support XOR. [report: Ade]
 - BUG: GTK: "Edit->Edit attributes of->layout" dialog does not close with WM decoration [report:celem]
 	- This dialog needs a scrolled window. => extend the attribute dialog both in gtk and lesstif to make scrollable window and rewrite this dialog using DAD, in the dialogs plugin