Skip to content
Snippets Groups Projects
Unverified Commit ee014912 authored by Mark Jan van Kampen's avatar Mark Jan van Kampen
Browse files

Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fix

# Conflicts:
#	CMakeLists.txt
parents 937b3ce9 e3f0319d
No related branches found
No related tags found
No related merge requests found
Showing
with 611 additions and 497 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment