Tim G L Lyons 6cb761b010 Merged trunk r18398 through r18497 into geps023. ...

Conflicts resolved in:
    NarrativeWeb.py


svn: r18498

2011-11-24 18:15:53 +00:00

..

test

added GPLv2 and SVN Id line

2011-10-18 18:14:07 +00:00

__init__.py

missing or malformed SVN "Id" line

2011-10-23 03:13:50 +00:00

backup.py

Merged trunk r17888 through r18397 into geps023.

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

base.py

Merged trunk r17888 through r18397 into geps023.

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

bsddbtxn.py

Some bsddb changes

2011-01-23 21:25:51 +00:00

cursor.py

missing or malformed SVN "Id" line

2011-10-23 03:13:50 +00:00

dbconst.py

Merged trunk r18398 through r18497 into geps023.

2011-11-24 18:15:53 +00:00

exceptions.py

5368: Loading familytree with downgraded Berkeley db should generate expressive error

2011-11-20 09:33:31 +00:00

Makefile.am

Remove gen.db.iterator.py - it is not used.

2010-01-06 04:44:09 +00:00

read.py

Implemented database upgrade for all eligible remaining object types.

2011-08-26 23:18:11 +00:00

txn.py

4198: Person view does not remove a row correctly when two people are merged.

2011-02-20 10:52:06 +00:00

undoredo.py

* Implemented merge Citation

2011-08-30 10:40:30 +00:00

upgrade.py

Fix bug that wasn't taking account of the fact that event references in Person and Family have attributes which themselves can have Citations.

2011-11-20 17:42:04 +00:00

write.py

Merged trunk r18398 through r18497 into geps023.

2011-11-24 18:15:53 +00:00