merge changes from gramps20

svn: r5482
This commit is contained in:
Alex Roitman
2005-12-06 06:38:09 +00:00
parent e0ff843bb4
commit 2f962b5f96
202 changed files with 112821 additions and 41664 deletions

View File

@@ -70,6 +70,12 @@
1 EDUC
2 DATE BET. 1979 - 1984
2 PLAC UC Berkeley
1 SSN 123-456-7890
1 CAST cast keyword
1 DSCR dscr keyword
1 IDNO idno keyword
1 NATI nati keyword
1 NCHI nchi keyword
1 _DEG
2 DATE 1984
2 PLAC B.S.E.E.
@@ -509,7 +515,6 @@
2 DATE 26 JUN 34 B.C.
2 PLAC Hayward, Alameda Co., CA
0 @F01@ FAM
1 HUSB @I01@
1 WIFE @I40@
1 CHIL @I42@
2 _FREL Adopted
@@ -529,9 +534,6 @@
1 CHIL @I29@
2 _FREL Adopted
2 _MREL Adopted
1 CHIL @I01@
2 _FREL Adopted
2 _MREL Adopted
1 MARR
2 DATE 4 JUN 1954
2 PLAC Sparks, Washoe Co., NV