Merge branch 'master' into no-self-connect
commit0c27942a04abfef795262c42c7a031f28f40028b
authorNedko Arnaudov <nedko@arnaudov.name>
Sun, 26 Jul 2009 15:16:37 +0000 (26 18:16 +0300)
committerNedko Arnaudov <nedko@arnaudov.name>
Sun, 26 Jul 2009 15:16:37 +0000 (26 18:16 +0300)
tree6c0c1c58b3fb2088e77457eb0425515785b8d4e2
parent6db194b3548400cdfc63c2a8bd29d05cb07dc1a8
parent4d64f8e232e0163d3bb10727baa80df3328ba3e5
Merge branch 'master' into no-self-connect

Duplicate 'L:' in getopt string removed.

Conflicts:
common/Jackdmp.cpp
common/JackConstants.h
common/Jackdmp.cpp