diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-22 09:18:53 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-22 09:18:53 (GMT) |
| commit | cb9852297373b8bdf462ea097e639b7dee11b972 (patch) | |
| tree | 2b6fe6e74506b1d73ea60fc4825f8355996dc05b /src/gui/kernel/qkeysequence.h | |
| parent | b62002db86e59a79703bb570003bf89f2ce7046c (diff) | |
| download | Qt-cb9852297373b8bdf462ea097e639b7dee11b972.zip Qt-cb9852297373b8bdf462ea097e639b7dee11b972.tar.gz Qt-cb9852297373b8bdf462ea097e639b7dee11b972.tar.bz2 | |
Fix a bad merge.
At some point, it seems that git didn't merge all of the changes in
Qt's mainline into our multitouch clone. This commit should fix this.
Diffstat (limited to 'src/gui/kernel/qkeysequence.h')
0 files changed, 0 insertions, 0 deletions