diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-10 20:23:57 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-10 20:23:57 -0200 |
| commit | 41b6f14acbde484cad2c8b670e5a3556ec62d7cf (patch) | |
| tree | e65034254700a0510b801335b9da7155baba5d51 /tests/pysidetest/CMakeLists.txt | |
| parent | 23c1b92073a25e23e2c3bdb2e1a758cfbb64fe79 (diff) | |
| parent | 2ef14fcc12f003620f85a30f6a4b00e8fee654d2 (diff) | |
Merge branch 1.0 into master
Conflicts:
PySide/QtCore/qvariant_conversions.h
Diffstat (limited to 'tests/pysidetest/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions