Merge pull request #5181 from alexrp/master
authorAlex Rønne Petersen <alex@alexrp.com>
Fri, 7 Jul 2017 02:33:57 +0000 (04:33 +0200)
committerGitHub <noreply@github.com>
Fri, 7 Jul 2017 02:33:57 +0000 (04:33 +0200)
commited0cefd19a79643bb66e61f925ecdb5342c70de3
tree2ebf6e32a5ea6a7f9ff843585fb249740e8bbac5
parentfd5843e964bfaf313e8e7f8672bf2ebe24e9315c
parent70c7f2ef1de78c67d569c050a8edeb2df79b0f86
Merge pull request #5181 from alexrp/master

[profiler] Fix a type name conflict.