diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-01-24 11:04:39 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-01-24 11:04:39 +0100 |
| commit | 8f9861cd0965353834b2dcd866c19fd502ecda5e (patch) | |
| tree | 8275f90466439c1ccf0dae132164751562b32963 /dist/copyright_template.txt | |
| parent | e8241adae3aa160aa2e119f16f9a4b8afcdc480e (diff) | |
| parent | 4345fc8c36c4df74ab05a07cf6fa073081b96d26 (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
qtcreator.pro
src/plugins/qtsupport/debugginghelperbuildtask.h
Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d
Diffstat (limited to 'dist/copyright_template.txt')
0 files changed, 0 insertions, 0 deletions