diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-28 06:50:06 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-28 06:50:06 (GMT) |
| commit | ab643ba4d2193352302d237ae36e1246b5399176 (patch) | |
| tree | 095cb3db01be9c169a5e602f767f610490ca9696 /demos/undo/undo.pro | |
| parent | 67ca33d53ff805ca33ba775524086a89cb975df9 (diff) | |
| parent | 797162603f35af1f67dd5a7c35c7004eef1828a9 (diff) | |
| download | Qt-ab643ba4d2193352302d237ae36e1246b5399176.zip Qt-ab643ba4d2193352302d237ae36e1246b5399176.tar.gz Qt-ab643ba4d2193352302d237ae36e1246b5399176.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/QmlChanges.txt
Diffstat (limited to 'demos/undo/undo.pro')
0 files changed, 0 insertions, 0 deletions