Merge branch 'master' into dev_train_binocular_ui
treee23c41ce780f5fdc117e59b415b4837de1f2c3e2
-rw-r--r-- 439 AUTHORS
-rw-r--r-- 18013 COPYING
-rw-r--r-- 22928 Makefile
-rw-r--r-- 115 Makefile.am
-rw-r--r-- 19751 Makefile.in
-rw-r--r-- 20452 Makefile.linux
-rw-r--r-- 22928 Makefile.osx
-rw-r--r-- 20104 Makefile_BUP
-rw-r--r-- 0 README
-rw-r--r-- 17498 acinclude.m4
-rw-r--r-- 37897 aclocal.m4
-rw-r--r-- 7133 artvertiser.cbp
-rw-r--r-- 7647 artvertiser.layout
drwxr-xr-x - artvertiser
drwxr-xr-x - artvertiser2
-rwxr-xr-x 61 autogen.sh
drwxr-xr-x - autom4te.cache
-rwxr-xr-x 43332 config.guess
-rw-r--r-- 2989 config.h
-rw-r--r-- 2741 config.h.in
-rw-r--r-- 39834 config.log
-rwxr-xr-x 32295 config.status
-rwxr-xr-x 31307 config.sub
-rwxr-xr-x 277476 configure
-rw-r--r-- 1608 configure.ac
-rwxr-xr-x 15205 depcomp
drwxr-xr-x - doc
drwxr-xr-x - garfeild
-rwxr-xr-x 9206 install-sh
-rwxr-xr-x 10587 missing
-rw-r--r-- 376 osx_prereqs.txt
drwxr-xr-x - scripts
-rw-r--r-- 23 stamp-h1
drwxr-xr-x - starter