Merge remote-tracking branch 'remotes/origin/master' into vb_picking_fix

This commit is contained in:
bubnikv
2019-08-07 14:31:16 +02:00
2 changed files with 23 additions and 13 deletions

View File

@@ -5,6 +5,7 @@
#include <string>
#include <vector>
#include <thread>
#include <atomic>
class wxImage;