Commit f4c0cdad authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' of www.graphics.rwth-aachen.de:OpenFlipper-Free/OpenFlipper-Free

parents 1c3ec778 d8efdf2c
......@@ -10,3 +10,7 @@
/build_dbg
/build_rel
/build
# QtCreator specific annoying files
CMakeLists.txt.user*
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment