Files
qt-creator/src/plugins/genericprojectmanager
Oswald Buddenhagen 6896546ba5 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
2013-07-25 13:18:31 +02:00
..
2013-05-06 08:38:50 +02:00