| commit | 87e2d954ab88b1c004a2200dcedb92e2dccfc210 | |
| author | Johannes Sixt <johannes.sixt@telecom.at> | |
| Sat, 19 May 2007 19:57:41 +0000 (19 21:57 +0200) | ||
| committer | Johannes Sixt <johannes.sixt@telecom.at> | |
| Sat, 19 May 2007 19:57:41 +0000 (19 21:57 +0200) | ||
| tree | 8aca0dd479f4539ad91b767e3e7cbda8168fd398 | treesnapshot (tar.gz zip) |
| parent | 6433ce0f9648e5cce13defd83338e7b8e19b8d1b | commitdiff |
| parent | 079f7cb27b6636f9153c24a82f3d5d74a7b0b6b1 | commitdiff |
Merge commit '079f7cb27b6636f9153c24a82f3d5d74a7b0b6b1'
Some topics were reverted in Junio's 'next'. Since this port was started
from 'next' while these topics were still in 'next', but was later changed
to pull in only master, these reversals were missed. This takes care of
this omission.
Some topics were reverted in Junio's 'next'. Since this port was started
from 'next' while these topics were still in 'next', but was later changed
to pull in only master, these reversals were missed. This takes care of
this omission.
| commit.c | diff1 | diff2 | blobhistory |
| git-checkout.sh | diff1 | diff2 | blobhistory |
| git-merge.sh | diff1 | diff2 | blobhistory |