diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
| commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
| tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /src/stm-bringup | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'src/stm-bringup')
| -rw-r--r-- | src/stm-bringup/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile index 797df2d6..b0943e56 100644 --- a/src/stm-bringup/Makefile +++ b/src/stm-bringup/Makefile @@ -1,4 +1,4 @@ -vpath % ..:../core:../product:../drivers:../stm +vpath % ..:../kernel:../product:../drivers:../stm vpath ao-make-product.5c ../util ifndef VERSION |