Index: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO	(revision 15904)
+++ trunk/doc/TODO	(revision 15905)
@@ -25,7 +25,6 @@
 	- "thermal recipe" so a padstack thermal can be put in a subc and it is change with the layer binding [report: jg]
 	- convert pcblib to subcircuits:
 		- revise the value attribute - should be empty by default
-	- BUG: require unique refdes: remove feauture
 	- remove ToggleHideName()
 	- advanced search GUI: new type names?
 	- BUG: put a 1206 on an empty board, save it in old .pcb -> pads become round; probably the same happens with old lihata? [report: igor2]
Index: trunk/doc/TODO.cleanup
===================================================================
--- trunk/doc/TODO.cleanup	(revision 15904)
+++ trunk/doc/TODO.cleanup	(revision 15905)
@@ -3,6 +3,5 @@
 	- conf_*
 - centralize pcb_gui->attribute_dialog()
 - remove pcb board Zoom/x/y, move the drc stuff to config
-- remove 'require unique refdes'
 - remove the polygrid feature from the ps exporter - use the poly hatch instead
 - move the GetXY action to central
Index: trunk/doc/conf/tree/editor.html
===================================================================
--- trunk/doc/conf/tree/editor.html	(revision 15904)
+++ trunk/doc/conf/tree/editor.html	(revision 15905)
@@ -13,7 +13,7 @@
 <tr><td> clear_line <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> new lines/arc clear polygons.
 <tr><td> clear_polypoly <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> new polygons clear polygons.
 <tr><td> full_poly <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> new polygons are full polygons.
-<tr><td> unique_names <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> force unique names
+<tr><td> unique_names <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> OBSOLETE: force unique names
 <tr><td> snap_pin <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> snap to pins and pads
 <tr><td> snap_offgrid_line <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> Snap to certain off-grid points along a line.
 <tr><td> marker_snaps <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> marker snaps to grid or snap points, as any other click
Index: trunk/src/conf_core.h
===================================================================
--- trunk/src/conf_core.h	(revision 15904)
+++ trunk/src/conf_core.h	(revision 15905)
@@ -26,7 +26,7 @@
 		CFT_BOOLEAN clear_line;            /* new lines/arc clear polygons. */
 		CFT_BOOLEAN clear_polypoly;        /* new polygons clear polygons. */
 		CFT_BOOLEAN full_poly;             /* new polygons are full polygons. */
-		CFT_BOOLEAN unique_names;          /* force unique names */
+		CFT_BOOLEAN unique_names;          /* OBSOLETE: force unique names */
 		CFT_BOOLEAN snap_pin;              /* snap to pins and pads */
 		CFT_BOOLEAN snap_offgrid_line;     /* Snap to certain off-grid points along a line. */
 		CFT_BOOLEAN marker_snaps;          /* marker snaps to grid or snap points, as any other click */
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 15904)
+++ trunk/src/gui_act.c	(revision 15905)
@@ -292,7 +292,7 @@
 			break;
 
 		case F_ToggleUniqueNames:
-			conf_toggle_editor(unique_names);
+			pcb_message(PCB_MSG_ERROR, "Unique names/refdes is not supported any more - please use the renumber plugin\n");
 			break;
 
 		case F_ToggleSnapPin:
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 15904)
+++ trunk/src/undo.c	(revision 15905)
@@ -81,11 +81,8 @@
 
 int pcb_undo(pcb_bool draw)
 {
-	int res, unique;
+	int res;
 
-	unique = conf_core.editor.unique_names;
-	conf_force_set_bool(conf_core.editor.unique_names, 0);
-
 	pcb_undo_and_draw = draw;
 
 	if (pcb_uundo.num_undo == 0) {
@@ -122,9 +119,6 @@
 	else if (pcb_undo_and_draw)
 		pcb_draw();
 
-	/* restore the unique flag setting */
-	conf_force_set_bool(conf_core.editor.unique_names, unique);
-
 	return res;
 }
 
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 15904)
+++ trunk/src_plugins/renumber/renumber.c	(revision 15905)
@@ -211,14 +211,6 @@
 	 * and renumber them.
 	 */
 
-	/*
-	 * turn off the flag which requires unique names so it doesn't get
-	 * in our way.  When we're done with the renumber we will have unique
-	 * names.
-	 */
-
-	conf_force_set_bool(conf_core.editor.unique_names, 0);
-
 	cnt_list = (struct _cnt_list *) calloc(cnt_list_sz, sizeof(struct _cnt_list));
 	for (i = 0; i < cnt; i++) {
 		if (subc_list[i]->refdes) {