summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
Commit message (Expand)AuthorAgeFilesLines
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
* Adjust license headershjk2012-10-051-21/+20
* rename QtDebug to QDebughjk2012-08-061-1/+1
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
* Long live the king!hjk2012-01-261-1/+1
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
* QmlDesigner.modelMerger: fix for importsThomas Hartmann2011-09-061-1/+1
* QmlDesigner.modelMerger: fixThomas Hartmann2011-06-241-1/+3
* QmlDesigner: using hasImportThomas Hartmann2011-05-161-1/+9
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
* Update license.hjk2011-04-131-14/+13
* QmlDesigner.copyNPase: fix for componentsThomas Hartmann2011-03-301-3/+3
* QmlDesigner: Change importAdded and importRemoved in importsChangedMarco Bubke2011-02-101-5/+3
* It's 2011 now.con2011-01-121-1/+1
* License headers.con2010-12-171-7/+11
* QmlDesigner.modelMerger: catch another exceptionThomas Hartmann2010-09-201-15/+20
* Revert "QmlDesigner: crash fix for copy and paste"Kai Koehne2010-06-101-3/+2
* QuickDesigner: Rename "core" directory to "designercore"Kai Koehne2010-05-051-0/+195