Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict resolution

Browse Source 
svn: r4668
This commit is contained in:
Don Allingham
2005-05-25 03:58:27 +00:00
parent 340e9a8eb7
commit 956b65327a
5 changed files with 11 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,3 +1,6 @@
2005-05-24 Don Allingham <don@gramps-project.org>
* various: CVS conflict resolution
2005-05-24 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/plugins/PHPGedViewConnector.py: Enhanced version.