Skip to content
Snippets Groups Projects
Commit 262fe1ef authored by Ben Boeckel's avatar Ben Boeckel
Browse files

Merge remote-tracking branch 'gl/gcasey/fix-macro-redefinition' into release-6.3 

* gl/gcasey/fix-macro-redefinition:
  Fix test compilation
  Fix macro redefinition errors
parents 1a04e8a1 41c73482
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 101 additions and 68 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment