diff options
| author | George Marques <george@gmarqu.es> | 2016-10-28 20:57:51 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 20:57:51 -0200 |
| commit | a52cbd65a8cc512c0292daedac59c3d7f1900286 (patch) | |
| tree | a56edbd479d39b6fea46ea9e72a1902379bdd221 /doc/tools/doc_merge.py | |
| parent | 8321e48ab0ac0700e1aef8f829140052c1ba4c6d (diff) | |
| parent | f7773d499dcd1d9580616dd1ba03f7382ac44cae (diff) | |
Merge pull request #6937 from SuperUserNameMan/fix_win_standalone_msvc_and_mingw_incompatibilities
fix bug introduced by #6501
Diffstat (limited to 'doc/tools/doc_merge.py')
0 files changed, 0 insertions, 0 deletions