[API-NEXT,02/15] merge fix: doc/driver-api-guide/Doxyfile

Message ID	20170127142921.29029-3-maxim.uvarov@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; From: Maxim Uvarov <maxim.uvarov@linaro.org> To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:08 +0300 Message-Id: <20170127142921.29029-3-maxim.uvarov@linaro.org> In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 02/15] merge fix: doc/driver-api-guide/Doxyfile Precedence: list Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>
Series	Merge tag 'v1.13.0.0' into api-next \| expand [API-NEXT,00/15] Merge tag 'v1.13.0.0' into api-next [API-NEXT,01/15] merge fix: platform/linux-generic/Makefile.am [API-NEXT,02/15] merge fix: doc/driver-api-guide/Doxyfile [API-NEXT,03/15] merge fix: _ishm [API-NEXT,04/15] merge fix: odp_config_internal.h [API-NEXT,05/15] merge fix: odp_schedule_if.h [API-NEXT,06/15] merge fix: odp_packet_internal.h [API-NEXT,07/15] merge fix: odp_init.c [API-NEXT,08/15] merge fix: odp_packet.c [API-NEXT,09/15] merge fix: odp_queue.c [API-NEXT,11/15] merge fix: odp_schedule_sp.c [API-NEXT,12/15] merge fix: odp_crypto_test_inp.c [API-NEXT,13/15] merge fix: test/common_plat/validation/api/packet/packet.h [API-NEXT,14/15] merge fix: test/common_plat/validation/api/packet/packet.c [API-NEXT,15/15] linux-gen: support older libconfig version

Message ID

20170127142921.29029-3-maxim.uvarov@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org
	designates 54.225.227.206 as permitted sender)
	client-ip=54.225.227.206; 
From: Maxim Uvarov <maxim.uvarov@linaro.org>
To: lng-odp@lists.linaro.org
Date: Fri, 27 Jan 2017 17:29:08 +0300
Message-Id: <20170127142921.29029-3-maxim.uvarov@linaro.org>
In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org>
References: <20170127142921.29029-1-maxim.uvarov@linaro.org>
Subject: [lng-odp] [API-NEXT PATCH 02/15] merge fix:
	doc/driver-api-guide/Doxyfile
Precedence: list
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Series

Merge tag 'v1.13.0.0' into api-next | expand

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m. UTC

---
 doc/driver-api-guide/Doxyfile | 10 ----------
 1 file changed, 10 deletions(-)

-- 
2.11.0.295.gd7dffce

diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile
index e3d3f920..b5f7260e 100644
--- a/doc/driver-api-guide/Doxyfile
+++ b/doc/driver-api-guide/Doxyfile
@@ -5,7 +5,6 @@  PROJECT_NUMBER = $(VERSION)
 PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg
 INPUT = $(SRCDIR)/doc/driver-api-guide \
 	$(SRCDIR)/include/odp/drv \
-<<<<<<< HEAD
 	$(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \
 	$(SRCDIR)/include/odp_drv.h
 PREDEFINED = __GNUC__ \
@@ -16,12 +15,3 @@  PREDEFINED = __GNUC__ \
 	     __x86_64__ \
 	     ODPDRV_PACKED \
 	     "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type"
-=======
-	$(SRCDIR)/include/odp_drv.h
-EXCLUDE_PATTERNS = drv* odp_drv.h
-EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)
-PREDEFINED = __GNUC__ \
-	     "ODP_HANDLE_T(type)=odp_handle_t type" \
-	     odpdrv_bool_t=int
-WARNINGS = NO
->>>>>>> v1.13.0.0

[API-NEXT,02/15] merge fix: doc/driver-api-guide/Doxyfile

Commit Message

Patch