| commit | 4ac7e466053422ae48b328b6be2aa9a17812d1dd | |
| author | Michal Čihař <mcihar@novell.com> | |
| Thu, 11 Mar 2010 13:00:01 +0000 (11 14:00 +0100) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Thu, 11 Mar 2010 13:00:01 +0000 (11 14:00 +0100) | ||
| tree | 0c01ea00897d51519c0205bce6cff224c983f873 | treesnapshot (tar.gz zip) |
| parent | d659f3ba2b6dafbd818caca1f22a45455690198c | commitdiff |
Forgotten conflict resolving after merge.
| ChangeLog | diffblobblamehistory |