diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:35:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:17:25 +0200 |
commit | 93bf5237673b8134a14ace198da3d140bbedca12 (patch) | |
tree | 515f56413cac4df02e192835079fab576163dba3 /.gitignore | |
parent | 3e7042fb70597150a137e2e449b67e759d45c3fe (diff) | |
parent | bacb0bec3cc2b409b215093f8e6ea3ff00c2af45 (diff) |
Merge branch 'release' into old/5.0old/5.0
Change-Id: I24a848a9789ef3e094522b0966a5d266ce06fecd
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions