Merge branch 'master' into clifford/pmgen

author Clifford Wolf <clifford@clifford.at>

Tue, 20 Aug 2019 09:39:23 +0000 (11:39 +0200)

committer GitHub <noreply@github.com>

Tue, 20 Aug 2019 09:39:23 +0000 (11:39 +0200)
author Clifford Wolf <clifford@clifford.at>
Tue, 20 Aug 2019 09:39:23 +0000 (11:39 +0200)
committer GitHub <noreply@github.com>
Tue, 20 Aug 2019 09:39:23 +0000 (11:39 +0200)
diff --cc Makefile
Simple merge
diff --cc passes/pmgen/.gitignore

index 849b73fd4c957f108f69d9ce8446cbcf6398e6ba,e52f3282f7f516caf1ca01ea41bde1de2bf1f3fa..6b319b8c3ee00bfc9c2ecb01d08e709fb026f92b
--- 1/passes/pmgen/.gitignore
--- 2/passes/pmgen/.gitignore
+++ b/passes/pmgen/.gitignore
@@@ -1,3 -1,1 +1,1 @@@
- /test_pmgen_pm.h
- /ice40_dsp_pm.h
- /peepopt_pm.h
- -/*_pm.h
++/*_pm.h
author	Clifford Wolf <clifford@clifford.at>
	Tue, 20 Aug 2019 09:39:23 +0000 (11:39 +0200)
committer	GitHub <noreply@github.com>
	Tue, 20 Aug 2019 09:39:23 +0000 (11:39 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
passes/pmgen/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history