diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 00:31:37 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 00:31:37 (GMT) |
| commit | 2ec89699a6f372ccbd92ce2bda753ec0e28f8650 (patch) | |
| tree | e8f5a9c9bb8cb41a7e47e7b75cd3f6ddac702814 /demos/embedded/flightinfo/flightinfo.pro | |
| parent | 351060bd313220044b9323d59d56627e78deea9f (diff) | |
| parent | 48592026bc9eb024f304411895c3f233b2296cfa (diff) | |
| download | Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.zip Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.gz Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
Diffstat (limited to 'demos/embedded/flightinfo/flightinfo.pro')
0 files changed, 0 insertions, 0 deletions