[inadyn-mt/f20: 2/2] New upstream release

[Jochen Schmitt]

commit 5d4ae0389c9dc65aae0a7f2dbe308493ddf6018e
Merge: 7c29d44 dbf69fa
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Jan 31 18:52:58 2015 +0100

    New upstream release

 .gitignore            |    4 ++
 inadyn-mt-libao.patch |   74 +++++++++++++++++++++++++++++++++++++++++++++++++
 inadyn-mt.spec        |   16 ++++++----
 inadyn.service        |    4 ++-
 sources               |    4 ++
 5 files changed, 94 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index b483ec3,894db04..4b5c912
--- a/.gitignore
+++ b/.gitignore
@@@ -1,23 -1,1 +1,27 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +inadyn-mt.v.02.18.36.tar.gz
 +/inadyn-mt.v.02.18.42.tar.gz
 +/inadyn-mt.v.02.18.50.tar.gz
 +/inadyn-mt.v.02.20.08.tar.gz
 +/inadyn-mt.v.02.20.20.tar.gz
 +/inadyn-mt.v.02.20.22.tar.gz
 +/inadyn-mt.v.02.20.28.tar.gz
 +/inadyn-mt.v.02.20.32.tar.gz
 +/inadyn-mt.v.02.20.34.tar.gz
 +/inadyn-mt.v.02.20.38.tar.gz
 +/inadyn-mt.v.02.20.40.tar.gz
 +/inadyn-mt.v.02.20.44.tar.gz
 +/inadyn-mt.v.02.24.06.tar.gz
 +/inadyn-mt.v.02.24.24.tar.gz
 +/inadyn-mt.v.02.24.30.tar.gz
 +/inadyn-mt.v.02.24.34.tar.gz
 +/inadyn-mt.v.02.24.36.tar.gz
 +/inadyn-mt.v.02.24.40.tar.gz
 +=======
  /inadyn-mt.v.02.24.43.tar.gz
 +/inadyn-mt.v.02.24.44.tar.gz
 +>>>>>>> 567b281... New upstream release
++=======
++/inadyn-mt.v.02.24.43.tar.gz
++>>>>>>> dbf69faf647db7f41f56c01cbc0c984c646cd88e
diff --cc sources
index 44e41f5,2561add..e8575ba
--- a/sources
+++ b/sources
@@@ -1,5 -1,1 +1,9 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +3a6fa37b3004dd4727a1e792563138f3  inadyn-mt.v.02.24.40.tar.gz
 +=======
 +0652d99aab1249d6a3afe4d65861e77b  inadyn-mt.v.02.24.44.tar.gz
 +>>>>>>> 567b281... New upstream release
++=======
+ ccef145f7c3e8c84aa7fe38c14b046f0  inadyn-mt.v.02.24.43.tar.gz
++>>>>>>> dbf69faf647db7f41f56c01cbc0c984c646cd88e