mirrors/poky
1
0 Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-11-15 02:47:16 +00:00
Code Issues Projects Releases Wiki Activity

ref-manual: Resolving a conflict

Browse Source 
(From yocto-docs rev: b364516928d04da38ef3188f07f190ffac64762b)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark authored and Richard Purdie committed 2016-03-23 21:56:08 +00:00
1 parent 4306f7f97a
commit 4c5157f7dc
19 files changed
+1187 -1239
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

documentation/ref-manual/ref-features.xml
+1 -3
View File
@@ -333,9 +333,7 @@
<filename>oprofile</filename>, <filename>exmap</filename>,
and <filename>LTTng</filename>.
For general information on user-space tools, see the
"<ulink url='&YOCTO_DOCS_ADT_URL;#user-space-tools'>User-Space Tools</ulink>"
section in the Yocto Project Application Developer's
Guide.
<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>.
</para></listitem>
<listitem><para><emphasis>tools-sdk:</emphasis>
Installs a full SDK that runs on the device.