Jonas Jensen eb55d964a8 C++: Fix semantic merge conflict ...

This test output must have been wrong because I produced it with an
extractor that didn't have #2153 applied.

2019-11-11 15:39:53 +01:00

..

constant_func

C++: Autoformat everything

2019-09-09 11:25:53 +02:00

constants

C++: Autoformat everything

2019-09-09 11:25:53 +02:00

escape

C++: ConvertToBase -> ConvertToNonVirtualBase

2019-11-10 10:35:53 +01:00

ir

C++: Fix semantic merge conflict

2019-11-11 15:39:53 +01:00

ssa

Merge from master

2019-11-08 10:42:29 -07:00