Commit 735e17f5 authored by Lukáš Lalinský's avatar Lukáš Lalinský
Browse files

Merge remote-tracking branch 'TsudaKageyu/64bit-atom' 

Conflicts:
	ConfigureChecks.cmake
parents fb1c744d 0731bc7b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment