merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -55,7 +55,7 @@ public:
                    int idivider = 0);
  bool did_texture_fail();
  void cancel();
-
+  void wait_until_paused();

 public slots:
  // cleanup functions