diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-07 00:05:01 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-07 00:05:01 (GMT) |
| commit | aef0f96295cefdaa6e8e799733892aa00987226c (patch) | |
| tree | baf6ea0443100739798cbd83089dbdfb5824f972 /doc/src/snippets/buffer/buffer.cpp | |
| parent | 2f298c32e13419d8942fa3ed6b561fa8c0cde24b (diff) | |
| parent | fe1165f3647c437528d9df437b939278f23260fc (diff) | |
| download | Qt-aef0f96295cefdaa6e8e799733892aa00987226c.zip Qt-aef0f96295cefdaa6e8e799733892aa00987226c.tar.gz Qt-aef0f96295cefdaa6e8e799733892aa00987226c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxscalegrid.cpp
Diffstat (limited to 'doc/src/snippets/buffer/buffer.cpp')
0 files changed, 0 insertions, 0 deletions