diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-11 16:29:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-11 16:29:21 +0100 |
| commit | 0533da6bc18038f7a4998e9becfc1d2eef6bdf27 (patch) | |
| tree | 93a57f26e83d98da8c31810b7bcb4a2bba907714 | |
| parent | 7c73e564bd61faa38fdd51947f8d98c03230f104 (diff) | |
| parent | d5cc1add47f3a9f8368a96f065a308dc59c72a11 (diff) | |
Merge branch 'stable' into release
this is done with -s ours, throwing away the sha1 updates in this
branch.
0 files changed, 0 insertions, 0 deletions