diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-25 14:31:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-25 14:31:00 (GMT) |
| commit | 3e36b311710009039e8ffdfa46702e012f25785b (patch) | |
| tree | e02a30a76a9e036bdc4fe85f35ba946d1a7d5389 /projects.pro | |
| parent | 9d8f5dcb46f64ee2f5e205100b603f6d01f1381b (diff) | |
| parent | 4b9784fcdd7321a5d82b8ae73edd1ae52786d7ad (diff) | |
| download | Qt-3e36b311710009039e8ffdfa46702e012f25785b.zip Qt-3e36b311710009039e8ffdfa46702e012f25785b.tar.gz Qt-3e36b311710009039e8ffdfa46702e012f25785b.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
Diffstat (limited to 'projects.pro')
0 files changed, 0 insertions, 0 deletions