espie c6287b2b53 fix @conflict marker ... while there, put common things in Makefile.inc bump revs according to discrepancies in COMMENT and in @conflict		2012-06-25 15:45:14 +00:00
..
1.4	fix @conflict marker	2012-06-25 15:45:14 +00:00
1.8	fix @conflict marker	2012-06-25 15:45:14 +00:00
1.9	fix @conflict marker	2012-06-25 15:45:14 +00:00
1.10	fix @conflict marker	2012-06-25 15:45:14 +00:00
1.11	fix @conflict marker	2012-06-25 15:45:14 +00:00
1.12	fix @conflict marker	2012-06-25 15:45:14 +00:00
Makefile	sync	2012-06-07 12:07:14 +00:00
Makefile.inc	fix @conflict marker	2012-06-25 15:45:14 +00:00