diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-10-18 14:05:34 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-10-18 14:05:34 +0300 |
| commit | 7daf393c1c766a1a5a5b422f738ee3d27b005dac (patch) | |
| tree | aa2d440ffefc1b25dd639749f651027570615ff9 /.gitmodules | |
| parent | 80c1f33ced14191671ae5efe06ffdae4de155c81 (diff) | |
| parent | c24e27022ad147ad3ebe2c1ab2aa6fe979dd043f (diff) | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
ChangeLog
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions