diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-26 13:04:47 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-26 13:04:47 +0200 |
| commit | 453e4860177460f1f5d573d5251be7f2505cab95 (patch) | |
| tree | eb8cda2fb510df45cc8a19fe354faaa34f172a15 /examples | |
| parent | 5e5c0a10ff9b4cd4f2b1cfdec4f976861b1de160 (diff) | |
| parent | 98233e748f70b97f0de906f399baf96eb25b6f1e (diff) | |
Merge remote-tracking branch 'origin/1.3' into 1.4
Conflicts:
README
src/libs/kdtools/kdupdaterupdateoperations.cpp
Change-Id: I88cf580f58ef44a85131cd53410b374c24996daf
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions