| commit | 1d8c30e78d14b157095ab12916d5a63c0821faa3 | |
| author | Joost Kremers <joostkremers@yahoo.com> | |
| Fri, 18 Apr 2008 10:50:19 +0000 (18 12:50 +0200) | ||
| committer | Joost Kremers <joostkremers@yahoo.com> | |
| Fri, 18 Apr 2008 10:50:19 +0000 (18 12:50 +0200) | ||
| tree | 66dac7f858088206b5102a8b19add8afdd9ce154 | treesnapshot (tar.gz zip) |
| parent | 84adf1334eb5e7c36622e8ad9d4bf17eae5e9b8e | commitdiff |
| parent | 8ce857d54e0a08a3ad8be47e15846f8015cec28c | commitdiff |
Merge branch 'devel' of git://repo.or.cz/ebib into devel
Conflicts:
src/ChangeLog
conflict resolved.
Conflicts:
src/ChangeLog
conflict resolved.
| src/ChangeLog | diff1 | diff2 | blobhistory |
| src/ebib.el | diff1 | diff2 | blobhistory |