Resolved merge conflicts. #17

Open
anomaly wants to merge 26 commits from anomaly/iw6-mod:master into master
Showing only changes of commit f1ec94f50b - Show all commits
+1 -1
View File
@@ -86,7 +86,7 @@ namespace // demo class
return false;
}
// trigger demo end-of-file which will repeat the demo
// set demo end-of-file which will repeat the demo
repeat_ = true;
file_.seekg(0, std::ios::end);