Commit graph

7 commits

Author SHA1 Message Date
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
Seth Alves
b2583298a9 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-05-03 10:45:55 -07:00
Howard Stearns
242001a589 Restore some very odd modularity used by VHACDUtil. 2015-04-29 22:17:44 -07:00
Stephen Birarda
1058a61ddd only look for OpenMP on UNIX 2015-04-15 15:21:35 -07:00
Stephen Birarda
134704412a check for OpenMP on non Win32 platforms 2015-04-15 15:13:39 -07:00
Stephen Birarda
6d53bb2809 remove extra directives from vhacd-util cmake 2015-04-15 14:48:42 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00