16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 22:39:18 +02:00

tmj merge (broken)

This commit is contained in:
milek7
2018-01-24 22:48:41 +01:00
26 changed files with 539 additions and 408 deletions

View File

@@ -20,7 +20,7 @@ inline bool strcend(std::string const &value, std::string const &ending)
gl_shader::gl_shader(std::string filename)
{
WriteLog("loading shader " + filename + " ..", false);
WriteLog("loading shader " + filename + " ..");
std::stringstream stream;
std::ifstream f;