Merge branch 'Mario/entrap_nade' into 'master'
[xonotic/xonotic-data.pk3dir.git] / cmake / CMakeDetermineASMCompiler.cmake
2016-05-01 terencehillMerge branch 'master' into terencehill/translate_colors_2 290/head
2016-05-01 terencehillMerge branch 'master' into terencehill/dynamic_hud
2016-04-30 MarioMerge branch 'sev/luma_update' into 'master'
2016-04-29 MarioMerge branch 'master' into Mario/use1 298/head
2016-04-14 TimePathMerge branch 'TimePath/cmake'
2016-04-14 TimePathAdd CMakeLists.txt