6 Commits

Author	SHA1	Message	Date
Vassilii Khachaturov	6da4a00375	6960: Error merging citations ... Back-port my work on this bug from gramps40. Unfortunately, the tests on gramps34 still fail (they pass on gramps40/trunk), but the repro steps marked by Nick in the bug succeed, so I shall stop here :) svn: r22965	2013-08-30 19:41:29 +00:00
Vassilii Khachaturov	00d233a3c5	Add missing imports, obsolete __main__ checks ... svn: r22943	2013-08-29 18:59:43 +00:00
Vassilii Khachaturov	3600d3f3c4	Back-port Nick's fix r22772 ... convert XML to use citations svn: r22942	2013-08-29 18:53:02 +00:00
Michiel Nauta	e1109cd0b0	4209: XML DTD rewrite, cleanup ... svn: r17647	2011-06-01 21:32:52 +00:00
Michiel Nauta	a2028ba0f6	Speedup merging ... svn: r17146	2011-04-18 21:09:49 +00:00
Michiel Nauta	d1a8593f7f	Add merge unittests ... svn: r16952	2011-03-27 21:15:07 +00:00