a503bf5470
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
---|---|---|
.. | ||
mac | ||
unix | ||
win32 | ||
makefile.cpp | ||
makefile.h | ||
makefiledeps.cpp | ||
makefiledeps.h | ||
metamakefile.cpp | ||
metamakefile.h | ||
projectgenerator.cpp | ||
projectgenerator.h | ||
xmloutput.cpp | ||
xmloutput.h |