Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| main.cpp | ||
| mandelbrot.pro | ||
| mandelbrotwidget.cpp | ||
| mandelbrotwidget.h | ||
| renderthread.cpp | ||
| renderthread.h | ||
Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| main.cpp | ||
| mandelbrot.pro | ||
| mandelbrotwidget.cpp | ||
| mandelbrotwidget.h | ||
| renderthread.cpp | ||
| renderthread.h | ||