diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-03 23:44:55 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-03 23:44:55 -0700 |
| commit | 0a14e20f7332344d4c2f73c7ede54ef0258997f7 (patch) | |
| tree | 37250740746ae2a6f19fff60891ba42846569f85 /ecp5/config.h | |
| parent | 45304d049f1c939ca3ac9782a1108f17e784a1cd (diff) | |
| parent | 65d73eb9838e0bb8e6d089ecde3d4ffaf34e9e29 (diff) | |
| download | nextpnr-0a14e20f7332344d4c2f73c7ede54ef0258997f7.tar.gz nextpnr-0a14e20f7332344d4c2f73c7ede54ef0258997f7.tar.bz2 nextpnr-0a14e20f7332344d4c2f73c7ede54ef0258997f7.zip | |
Merge branch 'master' into slack_histogram
Conflicts:
common/placer1.cc
Diffstat (limited to 'ecp5/config.h')
| -rw-r--r-- | ecp5/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ecp5/config.h b/ecp5/config.h index 038ddbf0..3d2ef971 100644 --- a/ecp5/config.h +++ b/ecp5/config.h @@ -20,8 +20,8 @@ #ifndef ECP5_CONFIG_H #define ECP5_CONFIG_H -#include "nextpnr.h" #include <map> +#include "nextpnr.h" NEXTPNR_NAMESPACE_BEGIN |