3adb1b7ffa
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 |
||
---|---|---|
.. | ||
__init__.py | ||
baseselector.py | ||
Makefile.am | ||
selectcitation.py | ||
selectevent.py | ||
selectfamily.py | ||
selectnote.py | ||
selectobject.py | ||
selectorexceptions.py | ||
selectorfactory.py | ||
selectperson.py | ||
selectplace.py | ||
selectrepository.py | ||
selectsource.py |