| commit | 36aa4aac793dac5094ebfebaebddb65fdafe2f25 | |
| author | Joost Kremers <joostkremers@yahoo.com> | |
| Fri, 18 Apr 2008 22:21:21 +0000 (19 00:21 +0200) | ||
| committer | Joost Kremers <joostkremers@yahoo.com> | |
| Fri, 18 Apr 2008 22:21:21 +0000 (19 00:21 +0200) | ||
| tree | 857f9456b8302218a47a028f6ae466ffe3f1d061 | treesnapshot (tar.gz zip) |
| parent | 0a41bec124e0f5a7ffa800ddff1215f04f134352 | commitdiff |
| parent | f462d58b14bea506693f6f6d98b1948c7b1b9120 | commitdiff |
Merge branch 'veyret' into devel
Conflicts:
src/ChangeLog
src/ebib.el
conflicts resolved.
Conflicts:
src/ChangeLog
src/ebib.el
conflicts resolved.
| src/ChangeLog | diff1 | diff2 | blobhistory |
| src/ebib.el | diff1 | diff2 | blobhistory |