diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-10 10:00:34 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-10 10:01:52 +0200 |
| commit | 5bf33901429e64ab91f30037e25ec04aab4b4c11 (patch) | |
| tree | 160e993f75f08a602360e5e4aac7cb52aa814036 /.gitmodules | |
| parent | 7a99b074b9565473c4cf95a622fc5b7dca278046 (diff) | |
| parent | 8190355557c13bba836cef49585556f0c823f672 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I958754b1f51ecdaf465faa7700d4e57f2df926fc
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions