Fix merge conflicts.
tree970d3ca3014d9ca45419fd78c7f91fcb2fd30144
-rw-r--r-- 50555 ChangeLog
-rw-r--r-- 30039 README
-rw-r--r-- 10878 README_NETJACK2
-rw-r--r-- 4036 TODO
drwxr-xr-x - common
-rw-r--r-- 374 config.h.in
drwxr-xr-x - dbus
-rw-r--r-- 31913 doxyfile
drwxr-xr-x - example-clients
-rw-r--r-- 295 jack.pc.in
drwxr-xr-x - linux
drwxr-xr-x - macosx
drwxr-xr-x - posix
drwxr-xr-x - solaris
-rwxr-xr-x 1220 svnversion_regenerate.sh
drwxr-xr-x - tests
-rwxr-xr-x 73208 waf
drwxr-xr-x - windows
-rw-r--r-- 12197 wscript