Merge commit 'origin/1.0.0'
Conflicts: doc/qtcreator.qdoc src/plugins/qt4projectmanager/qt4project.cpp src/tools/qpatch/qpatch.cpp
GPL_EXCEPTION.TXT
deleted
100644 → 0
LGPL_EXCEPTION.TXT
0 → 100644
LICENSE.GPL
deleted
100644 → 0
LICENSE.GPL3
deleted
100644 → 0
This diff is collapsed.
LICENSE.LGPL
0 → 100644
This diff is collapsed.

| W: | H:
| W: | H:



| W: | H:
| W: | H:

