| commit | c5537ef91e48802ccabc2e2d97e5abe29cb931bf | |
| author | Alex Montgomery <apmontgomery@gmail.com> | |
| Thu, 15 Jan 2009 19:37:10 +0000 (15 19:37 +0000) | ||
| committer | Alex Montgomery <apmontgomery@gmail.com> | |
| Thu, 15 Jan 2009 19:37:10 +0000 (15 19:37 +0000) | ||
| tree | 223c5280f4b5da844274ba873f5d21c8ff760f0e | treesnapshot (tar.gz zip) |
| parent | 16683dcce4d00f9bbca76e10af102f54831cccf7 | commitdiff |
| parent | 11bba5705f1c757040754557338bd8a62ccd5ce5 | commitdiff |
merged in GPL header
Merge branch 'master' of git://repo.or.cz/jackctlmmc
Conflicts:
main.c
Merge branch 'master' of git://repo.or.cz/jackctlmmc
Conflicts:
main.c
| GNUmakefile | diff1 | diff2 | blobhistory |
| main.c | diff1 | diff2 | blobhistory |