Merge remote-tracking branch 'origin/3.0'

Browse Source

Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99

...

This commit is contained in:

Eike Ziller

2013-10-30 13:34:46 +01:00

parent bcd704d7bf 88c647ce68

commit 0ddb6cac29

341 changed files with 3480 additions and 2241 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1636

src/plugins/qmakeprojectmanager/qmakeproject.cpp Normal file

File diff suppressed because it is too large Load Diff