merged - develop

This commit is contained in:
Luis Ángel San Martín
2018-03-03 23:36:29 +01:00
112 changed files with 4751 additions and 2453 deletions

View File

@ -7,7 +7,7 @@
#include <unarr.h>
CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) :
QObject(parent),valid(false),tools(true),numFiles(0),ar(NULL),stream(NULL)
QObject(parent),tools(true),valid(false),numFiles(0),ar(NULL),stream(NULL)
{
//open file
#ifdef Q_OS_WIN