Tim G L Lyons 3adb1b7ffa Merged trunk r17888 through r18397 into geps023. ...

Conflicts resolved in:
    /data/grampsxml.dtd
    /data/grampsxml.rng
    /src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
    /src/plugins/import/ImportXml.py
(Various property conflicts also resolved)

svn: r18405

2011-11-05 19:07:58 +00:00

..

man

…

gnome-mime-application-x-gedcom.png

…

gnome-mime-application-x-gedcom.svg

…

gnome-mime-application-x-geneweb.png

…

gnome-mime-application-x-geneweb.svg

…

gnome-mime-application-x-gramps-package.png

…

gnome-mime-application-x-gramps-package.svg

…

gnome-mime-application-x-gramps-xml.png

…

gnome-mime-application-x-gramps-xml.svg

…

gnome-mime-application-x-gramps.png

…

gnome-mime-application-x-gramps.svg

…

gramps_canonicalize.xsl

…

gramps.applications

…

gramps.desktop.in

…

gramps.keys.in

…

gramps.mime

…

gramps.xml.in

…

grampsxml.dtd

Merged trunk r17888 through r18397 into geps023.

2011-11-05 19:07:58 +00:00

grampsxml.rng

Merged trunk r17888 through r18397 into geps023.

2011-11-05 19:07:58 +00:00

Makefile.am

…