diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-04-15 11:19:56 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-04-15 11:19:56 +0200 |
| commit | 21099dac569348a15df2d6a5a61015b5afa17097 (patch) | |
| tree | b4ae338f206666b7f07e1f78278ad6d38609880b /src/gui/kernel/qkeysequence.h | |
| parent | f169ca1020886707b04101300e365d79f38a6332 (diff) | |
| parent | 4e78de5a4281bd1c27a984b13887975798573aae (diff) | |
| download | qt4-tools-21099dac569348a15df2d6a5a61015b5afa17097.tar.gz | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/gui/kernel/qkeysequence.h')
0 files changed, 0 insertions, 0 deletions