aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2
blob: 68f06c122b90308a59b0a980db85613ea00f25f8 (plain)
1
2
3
4
5
6
7
8
9
tree 88588caa0942e36ed8ace3ec1af9d8455848165b
parent a3c1f3a466bedb842da88a749d5d5b478aa733b7
parent f2025fef1da1c7304514e2b4957dbe386d9349be
author Christian Tismer <tismer@stackless.com> 1451261913 +0100
committer Christian Tismer <tismer@stackless.com> 1451261913 +0100

Merge pull request #23 from IronManMark20/master

Fix for deprecation of <unordered_map> in MSVC 14