diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-12-28 13:54:06 +0100 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-12-28 13:54:06 +0100 |
| commit | 796d6489953927105d3b0ed22308f29676b168fa (patch) | |
| tree | bc0f470642c0943713c441aa7c3e9e310cb23ccc /gui | |
| parent | 50f87a6024859d197eefa8de0b0b616b1e03e239 (diff) | |
| parent | 0d43aff2682d91817ea4a1fb5dff6e169ae9a659 (diff) | |
| download | nextpnr-796d6489953927105d3b0ed22308f29676b168fa.tar.gz nextpnr-796d6489953927105d3b0ed22308f29676b168fa.tar.bz2 nextpnr-796d6489953927105d3b0ed22308f29676b168fa.zip | |
Merge remote-tracking branch 'origin/master' into mmicko/ecp5_gui
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/basewindow.cc | 1 | ||||
| -rw-r--r-- | gui/ice40/mainwindow.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gui/basewindow.cc b/gui/basewindow.cc index 7290f73c..c3dbc131 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -28,7 +28,6 @@ #include <fstream>
#include "designwidget.h"
#include "fpgaviewwidget.h"
-#include "jsonparse.h"
#include "jsonwrite.h"
#include "log.h"
#include "mainwindow.h"
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index ccff2117..dc8a3a23 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -27,7 +27,6 @@ #include <fstream>
#include "bitstream.h"
#include "design_utils.h"
-#include "jsonparse.h"
#include "log.h"
#include "pcf.h"
|