Conflicts:
	Makefile.am
	configure.ac


Origin commit data
------------------
Branch: master
Commit: 561c4239ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-06-17 (Mon, 17 Jun 2019)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-06-17 16:52:54 +02:00
129 changed files with 173 additions and 31 deletions

View File

@@ -40,7 +40,7 @@ libarmbox_la_SOURCES += \
playback_libeplayer3.cpp
AM_CPPFLAGS += \
-I$(top_srcdir)/libeplayer3-arm/include
-I$(top_srcdir)/libeplayer3/include
endif
AM_LDFLAGS += \