e918605f42
Conflicts: src/corelib/json/qjsonparser.cpp src/gui/opengl/qopengl.cpp Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b |
||
---|---|---|
.. | ||
doc | ||
jennifer.xbel | ||
main.cpp | ||
mainwindow.cpp | ||
mainwindow.h | ||
streambookmarks.pro | ||
xbelreader.cpp | ||
xbelreader.h | ||
xbelwriter.cpp | ||
xbelwriter.h |