diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-06 15:47:40 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-06 15:49:56 +0000 |
| commit | 750239bebb992ee673f39da98f413ab0f2e1f002 (patch) | |
| tree | 4fc3a4f2c56a41d750baab84c392eec09fe6f75f /src/browserdialog.cpp | |
| parent | cb09ace972731ecc9b0fb653b88d4c599f4530fc (diff) | |
| parent | 865c75a499fe2319ed07e36d8d5d987032058882 (diff) | |
Merge branch 'master' into issue/344
# Conflicts:
# src/gameinfoimpl.cpp
# src/gameinfoimpl.h
# src/shared/fallout3info.h
# src/shared/falloutnvinfo.h
# src/shared/gameinfo.h
# src/shared/oblivioninfo.h
# src/shared/skyriminfo.h
Diffstat (limited to 'src/browserdialog.cpp')
| -rw-r--r-- | src/browserdialog.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/browserdialog.cpp b/src/browserdialog.cpp index c382c112..e5f0f21d 100644 --- a/src/browserdialog.cpp +++ b/src/browserdialog.cpp @@ -18,18 +18,16 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>. */
#include "browserdialog.h"
+
#include "ui_browserdialog.h"
#include "browserview.h"
-
#include "messagedialog.h"
#include "report.h"
#include "persistentcookiejar.h"
-#include "json.h"
-
#include <utility.h>
-#include <gameinfo.h>
#include "settings.h"
+
#include <QNetworkCookieJar>
#include <QNetworkCookie>
#include <QMenu>
|