Merge branch 'master' into feature_184_take_3
Conflicts: src/source/CppGenerator.scala test-suite/generated-src/cpp/extended_record_base.hpp test-suite/generated-src/objc/DBExtendedRecord+Private.h test-suite/handwritten-src/cpp/extended_record.hpp
Showing
Please register or sign in to comment