| commit | 29fa9ee009608e23c72d0b1be29b589405b9315f | |
| author | Thiago Macieira <thiago.macieira@trolltech.com> | |
| Sun, 24 Aug 2008 12:54:09 +0000 (24 14:54 +0200) | ||
| committer | Thiago Macieira <thiago.macieira@trolltech.com> | |
| Sun, 24 Aug 2008 12:54:09 +0000 (24 14:54 +0200) | ||
| tree | 80fc6f7312f02790a385351bc2ffcaa7ea2e0c8f | treesnapshot (tar.gz zip) |
| parent | 39c41f45a5ad302f779719a3e734510006d8425d | commitdiff |
| parent | e3f0499dfacda04c6c7de3cc103d9f1824f0d251 | commitdiff |
Merge branch 'master' of ../fast-export2 into with-fixups
Conflicts:
src/repository.cpp
src/repository.h
Conflicts:
src/repository.cpp
src/repository.h
| src/repository.cpp | diff1 | diff2 | blobhistory |
| src/repository.h | diff1 | diff2 | blobhistory |