Fix merge conflict from crazy-branch
tree4fa6ee8681eb4e28568700e0e54b9a480432c9c8
-rw-r--r-- 41 .gitignore
drwxr-xr-x - ode
drwxr-xr-x - qt
-rw-r--r-- 6 test