Merge remote-tracking branch 'origin/master'
treebaa313eac411c290c9f260f342918b826bd1f078
-rw-r--r-- 60 .gitignore
-rw-r--r-- 35147 COPYING.GPL3
-rw-r--r-- 72287 Doxyfile
-rw-r--r-- 5169 Makefile
drwxr-xr-x - avi
drwxr-xr-x - bsnes-patches
drwxr-xr-x - include
-rw-r--r-- 95422 manual.lyx
-rw-r--r-- 55780 manual.txt
drwxr-xr-x - src