Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationmaster
treecf5d9f100f640385d13948912eabc89d889e6fc8
-rw-r--r-- 324 .commit-template
-rw-r--r-- 3411 .gitignore
-rwxr-xr-x 2283 .hgignore
-rw-r--r-- 742 INSTALL
-rw-r--r-- 1187 LGPL_EXCEPTION.txt
-rw-r--r-- 26835 LICENSE.LGPL
-rw-r--r-- 31573 LICENSE.PREVIEW.COMMERCIAL
drwxr-xr-x - bin
drwxr-xr-x - config.tests
-rwxr-xr-x 275114 configure
-rw-r--r-- 1176064 configure.exe
drwxr-xr-x - demos
drwxr-xr-x - dist
drwxr-xr-x - doc
drwxr-xr-x - examples
drwxr-xr-x - lib
drwxr-xr-x - mkspecs
-rw-r--r-- 6740 projects.pro
drwxr-xr-x - qmake
drwxr-xr-x - src
drwxr-xr-x - tests
drwxr-xr-x - tools
drwxr-xr-x - translations
drwxr-xr-x - util