summaryrefslogtreecommitdiffstats
path: root/LICENSE.FDL
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-12 08:06:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-12 08:06:27 (GMT)
commitf08dba7fbbc53f4dcc8cc431e69c74192141eeba (patch)
treef514c4d52f6acc830aa176c3a8e5b9cdd238f79c /LICENSE.FDL
parentd2b05885a28aafa331b25cdf3b647b782605df08 (diff)
parent404568a382d09e603013734533239e18d2bf8957 (diff)
downloadQt-f08dba7fbbc53f4dcc8cc431e69c74192141eeba.zip
Qt-f08dba7fbbc53f4dcc8cc431e69c74192141eeba.tar.gz
Qt-f08dba7fbbc53f4dcc8cc431e69c74192141eeba.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Update XCreateWindow in qgl_X11egl.cpp Lancelot: support for custom keys added to protocol. API cleanup.
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions