| commit | cd9f022c10cd398b6dc7f757ff57bbf111911fd1 | |
| author | ygrek <ygrek@autistici.org> | |
| Tue, 21 Oct 2008 09:33:15 +0000 (21 12:33 +0300) | ||
| committer | ygrek <ygrek@autistici.org> | |
| Tue, 21 Oct 2008 09:33:15 +0000 (21 12:33 +0300) | ||
| tree | 7e9a25e97fd2e5921439c803292d4feaa8661020 | treesnapshot (tar.gz zip) |
| parent | 1e2e9a6cdbcf4a328e7e38f7a6a2b6ed8830d20c | commitdiff |
| parent | 0c648db859a6ec0e2d30d8f5cdb5249ce79cbcc3 | commitdiff |
Merge remote branch 'master'
Conflicts:
lib-src/Makefile
Conflicts:
lib-src/Makefile
| Makefile.config | diff2 | blobhistory | |
| lib-src/Makefile | diff1 | diff2 | blobhistory |