diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 13:58:44 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 14:01:29 +0200 |
| commit | 4aa6869877d4906fcfaac5388294748512cace25 (patch) | |
| tree | 56ede34c11ec04040396dc47c843966db83b4eb2 /demos/deform | |
| parent | 342e59730c512fd38a0b03888254b52f2a181ae9 (diff) | |
Remove changes from bad merge.
This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again,
this most likely happened when switching between 4.5 and 4.6 and
resolving some conflict incorrectly.
Diffstat (limited to 'demos/deform')
0 files changed, 0 insertions, 0 deletions