Merge branch 'master' of git://repo.or.cz/jackctlmmc
commit249e2859f5c84af25c9266286e6c17b898de3a79
authorAlex Montgomery <apmontgo@users.sourceforge.net>
Sun, 24 Apr 2011 17:13:05 +0000 (24 18:13 +0100)
committerAlex Montgomery <apmontgo@users.sourceforge.net>
Sun, 24 Apr 2011 17:13:05 +0000 (24 18:13 +0100)
tree886d83b8b96e99da6b23817ea1ebf6c351110be7
parent64165c81f720fb887faf2c80eddae9c733529365
parentff566e65e6ed85b9a36b11a6ee771bbe59787dc2
Merge branch 'master' of git://repo.or.cz/jackctlmmc

Conflicts:
GNUmakefile
GNUmakefile
common.c