Signed-off-by: Thilo Graf <dbt@novatux.de>
Conflicts:
libeplayer3-arm/manager/subtitle.c
additional format fixes, solved conflicts and clean up
Origin commit data
------------------
Branch: master
Commit: 15b4162b58
Author: max_10 <max_10@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 5930dca63f
Author: max_10 <max_10@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 1ac7e9202c
Author: max_10 <max_10@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 32f64c474d
Author: max_10 <max_10@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: f72e8edc2e
Author: max_10 <max_10@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: e6c29f2545
Author: max_10 <max_10@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: d2bb71dcab
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-01-03 (Wed, 03 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: db374e2225
Author: max_10 <max_10@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 6ae2a21f9c
Author: max_10 <max_10@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: b5744e2728
Author: max_10 <max_10@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 3b25b464c3
Author: TangoCash <eric@loxat.de>
Date: 2017-12-29 (Fri, 29 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 96bb5eb255
Author: max_10 <max_10@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: dfafcfa01c
Author: max_10 <max_10@gmx.de>
Date: 2017-12-22 (Fri, 22 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: ac5aacd704
Author: max_10 <max_10@gmx.de>
Date: 2017-12-22 (Fri, 22 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 3d8987513d
Author: TangoCash <eric@loxat.de>
Date: 2017-12-25 (Mon, 25 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 3d6689cfca
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 2a7f1bb1fa
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: c15484e01a
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: e5a50e7126
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 3ca9c451a4
Author: max_10 <max_10@gmx.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: f9b1b8aa58
Author: TangoCash <eric@loxat.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: b75f8393c2
Author: max_10 <max_10@gmx.de>
Date: 2017-12-16 (Sat, 16 Dec 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
