merge with dev

This commit is contained in:
Alberto Griggio
2017-06-19 13:52:26 +02:00
95 changed files with 766 additions and 953 deletions

View File

@@ -22,7 +22,7 @@
#include "inspector.h"
#include "placesbrowser.h"
FilePanel::FilePanel () : parent(nullptr)
FilePanel::FilePanel () : parent(nullptr), error(0)
{
// Contains everything except for the batch Tool Panel and tabs (Fast Export, Inspect, etc)