diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-06-26 09:35:16 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-29 12:07:00 (GMT) |
| commit | f1d3ed3a4adc2f1859102afb03b5c794d569940c (patch) | |
| tree | a27602762705501c80fe689aac23c376612aa77e /demos/chip/view.cpp | |
| parent | db8f05e257019694f5e8076845626008f2adc3dd (diff) | |
| download | Qt-f1d3ed3a4adc2f1859102afb03b5c794d569940c.zip Qt-f1d3ed3a4adc2f1859102afb03b5c794d569940c.tar.gz Qt-f1d3ed3a4adc2f1859102afb03b5c794d569940c.tar.bz2 | |
Manually fix bad merges and make sure everything compiles with 4.6.
Diffstat (limited to 'demos/chip/view.cpp')
0 files changed, 0 insertions, 0 deletions