| commit | 0a41bec124e0f5a7ffa800ddff1215f04f134352 | |
| author | Joost Kremers <joostkremers@yahoo.com> | |
| Fri, 18 Apr 2008 21:57:17 +0000 (18 23:57 +0200) | ||
| committer | Joost Kremers <joostkremers@yahoo.com> | |
| Fri, 18 Apr 2008 21:57:17 +0000 (18 23:57 +0200) | ||
| tree | d3a339cbdebe060cccfbe77d8e8e8f16baee8892 | treesnapshot (tar.gz zip) |
| parent | 7b5d7e80dd346026c9571dbcc34189abbffac3d2 | commitdiff |
| parent | bd51732e74efe0900302db669ace1f32fb9ebaf4 | commitdiff |
Merge branch 'devel'
Conflicts:
src/ChangeLog
conflicts resolved.
Conflicts:
src/ChangeLog
conflicts resolved.
| src/ChangeLog | diff1 | diff2 | blobhistory |
| src/ebib.el | diff1 | diff2 | blobhistory |