diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2016-03-09 13:30:27 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 21:56:08 +0000 |
commit | 4c5157f7dcfecab3b4e4483cd122e0ae74b377ee (patch) | |
tree | 03c0812d79db78ebfd454b540338b66e2dc20521 /documentation/Makefile | |
parent | 4306f7f97a2ea05ebf141947294729584795d832 (diff) | |
download | openembedded-core-contrib-4c5157f7dcfecab3b4e4483cd122e0ae74b377ee.tar.gz |
ref-manual: Resolving a conflict
(From yocto-docs rev: b364516928d04da38ef3188f07f190ffac64762b)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/Makefile')
-rw-r--r-- | documentation/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/Makefile b/documentation/Makefile index d201f98f4f..ec6566713a 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -128,7 +128,7 @@ TARFILES = dev-style.css dev-manual.html \ figures/wip.png else TARFILES = dev-style.css dev-manual.html \ - figures/app-dev-flow.png figures/bsp-dev-flow.png \ + figures/bsp-dev-flow.png \ figures/dev-title.png figures/git-workflow.png \ figures/index-downloads.png figures/kernel-dev-flow.png \ figures/kernel-overview-1.png figures/kernel-overview-2-generic.png \ @@ -202,7 +202,7 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \ figures/buildhistory-web.png \ figures/adt-title.png figures/sdk-title.png figures/bsp-title.png \ figures/kernel-dev-title.png figures/kernel-architecture-overview.png \ - figures/app-dev-flow.png figures/bsp-dev-flow.png \ + figures/bsp-dev-flow.png \ figures/dev-title.png \ figures/git-workflow.png figures/index-downloads.png \ figures/kernel-dev-flow.png \ @@ -249,7 +249,7 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \ figures/compatible-layers.png figures/import-layer.png figures/new-project.png \ figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \ figures/sdk-devtool-add-flow.png figures/sdk-installed-extensible-sdk-directory.png \ - figures/sdk-devtool-modify-flow.png + figures/sdk-devtool-modify-flow.png figures/sdk-eclipse-dev-flow.png endif MANUALS = $(DOC)/$(DOC).html @@ -293,7 +293,7 @@ ALLPREQ = html eclipse tarball TARFILES = sdk-manual.html sdk-style.css figures/sdk-title.png \ figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \ figures/sdk-installed-extensible-sdk-directory.png figures/sdk-devtool-add-flow.png \ - figures/sdk-devtool-modify-flow.png \ + figures/sdk-devtool-modify-flow.png figures/sdk-eclipse-dev-flow.png \ eclipse MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse FIGURES = figures |