Merge branch 'master' into new_obj_stream_handling
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 19:04:02 +0000 (21:04 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 19:04:02 +0000 (21:04 +0200)
commitcbe2e9af49b7b67aae313b7c5381b6b47456dffc
treeedcff52a7ffeb397c1a67df2f4c366dd63aa0c56
parentd3a3bd9c12c8caa1ccc11f798130b1bee41979e5
parent1724cc9e66cb4cf7a8ae7d6dcec2e3dad79d1f26
Merge branch 'master' into new_obj_stream_handling
code/CMakeLists.txt
code/ObjFileParser.cpp