Merge branch 'master' into ladi-experimental
commit6a645977a310e2c17d01a9c0f795fd0e5f5ab79b
authorNedko Arnaudov <nedko@arnaudov.name>
Fri, 3 Aug 2012 01:29:31 +0000 (3 04:29 +0300)
committerNedko Arnaudov <nedko@arnaudov.name>
Fri, 3 Aug 2012 01:29:31 +0000 (3 04:29 +0300)
treebdb90aba2f9e6e92ab99370cdd166cac982858c0
parentd16faa4a20f60e47dee400df4e7fc34c120fc46b
parenta176212a8e330d280089c8061be84d9209310009
Merge branch 'master' into ladi-experimental
common/JackEngine.cpp