| commit | 98f3e1d301b8a408aa64b6ed3e220ee2fa64421b | |
| author | mhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087> | |
| Wed, 17 May 2006 21:36:12 +0000 (17 21:36 +0000) | ||
| committer | mhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087> | |
| Wed, 17 May 2006 21:36:12 +0000 (17 21:36 +0000) | ||
| tree | ffa20f853ccdc2288d9457ecc2f256d04a2de290 | treesnapshot (tar.gz zip) |
| parent | c0554cdcfe445cc584811ab611e30aa7e29aaca5 | commitdiff |
Merged the following revisions from branches/graph-based via svnmerge:
1989-1998,2000-2002,2004-2025,2027-2033,2045-2052,2056-2063,2067-2069,2074-2075
This brings trunk up to graph-based r2075.
I had to fix a conflict on cvs2svn_lib/cvs_revision.py (by taking the
branch version verbatim).
git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@2076 be7e6eca-30d4-0310-a8e5-ac0d63af7087
1989-1998,2000-2002,2004-2025,2027-2033,2045-2052,2056-2063,2067-2069,2074-2075
This brings trunk up to graph-based r2075.
I had to fix a conflict on cvs2svn_lib/cvs_revision.py (by taking the
branch version verbatim).
git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@2076 be7e6eca-30d4-0310-a8e5-ac0d63af7087
22 files changed: