Skip to content
Snippets Groups Projects
Unverified Commit 66f944f7 authored by teor's avatar teor
Browse files

Merge branch 'bug28096-029-squashed' into bug28096-034-squashed 

Merge the new code, and preserve the #else macro comment from 0.3.4.
parents 155b0f55 2fbc58cf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment