diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-02 17:12:20 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-02 17:12:47 +0200 |
| commit | 9c79a3de3c0600c991af2aa2b9306040cdbb83c8 (patch) | |
| tree | 7ac2cfabcbfd9d6d9e6c4e89994afe3414728150 /LICENSE.FDL | |
| parent | 712ecdac9edfaacf3e3b1a419bec1fda548d8316 (diff) | |
| parent | 2b71f5f2ce41deb9baf91df2db9ec568e98814e8 (diff) | |
| download | qtscript-9c79a3de3c0600c991af2aa2b9306040cdbb83c8.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ia3c3478a804b369b00aabb5739f409bd11dbb982
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions