diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:09:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:09:41 +0100 |
| commit | 6e55d96d899b78d17de022f2e1d93f210ff7a1d0 (patch) | |
| tree | 508b3ed5ffa86f97109a2b9f5fec83028a687071 /src/activeqt/control/qaxserverdll.cpp | |
| parent | 5173ee755e9d90c44b748f57090c0df8cf9a79df (diff) | |
| parent | 4c9ff9aee8d235f7bf2a7c996682ead00434034d (diff) | |
| download | qtactiveqt-6e55d96d899b78d17de022f2e1d93f210ff7a1d0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I79653f486b1c67f5dc2647847b4f79fa8b5f593f
Diffstat (limited to 'src/activeqt/control/qaxserverdll.cpp')
0 files changed, 0 insertions, 0 deletions