Files
qt-creator/src/plugins/cmakeprojectmanager
Eike Ziller e7ea94b688 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
2014-07-17 12:42:04 +02:00
..
2014-07-01 11:52:08 +02:00
2014-07-01 11:52:08 +02:00