Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
treefaf47ac31b5582c59e2a7f1b32c3a65d77111c85
-rw-r--r-- 879 .gitignore
-rw-r--r-- 3775 GPL_EXCEPTION.TXT
-rw-r--r-- 11952 GPL_EXCEPTION_ADDENDUM.TXT
-rw-r--r-- 35 HACKING
-rw-r--r-- 15146 LICENSE.GPL
-rw-r--r-- 35147 LICENSE.GPL3
drwxr-xr-x - bin
drwxr-xr-x - doc
drwxr-xr-x - examples
-rwxr-xr-x 1273 fix_makefile_header_dependencies.sh
-rw-r--r-- 285 qtcreator.pro
-rwxr-xr-x 3261 replaceVersion.sh
drwxr-xr-x - scripts
drwxr-xr-x - shared
drwxr-xr-x - src
drwxr-xr-x - tests