[SCM] vamp-plugin-sdk/master: Resolve merge conflict

[mira-guest at users.alioth.debian.org]

Imported Upstream version 2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4f04a1a4c7aa757003b731b2ea71e1ec5b2dc0da
X-Git-Newrev: c3a562e424e95cd4d6dcbed2ec55fdc07eac8a3f

The following commit has been merged in the master branch:
commit c3a562e424e95cd4d6dcbed2ec55fdc07eac8a3f
Merge: 4f04a1a4c7aa757003b731b2ea71e1ec5b2dc0da 2790de897492b7fa2110a73790b60f0889d9e1a7
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 29 12:40:08 2012 +0100

    Resolve merge conflict

diff --combined examples/FixedTempoEstimator.cpp
index fa1c700,a7ea1ee..1871977
--- a/examples/FixedTempoEstimator.cpp
+++ b/examples/FixedTempoEstimator.cpp
@@@ -45,6 -45,7 +45,10 @@@ using Vamp::RealTime
  
  #include <cmath>
  #include <cstdio>
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> upstream/2.4
  
  class FixedTempoEstimator::D
  // this class just avoids us having to declare any data members in the header

-- 
vamp-plugin-sdk packaging