Merge tag 'upstream/2.2'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 28 Dec 2013 14:23:27 +0000 (16:23 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 28 Dec 2013 14:23:27 +0000 (16:23 +0200)
commit05cd6af14b504b2d4bf1c0cec47b1ed6f8496ae8
tree5113838dc49d261e00296a47e0ed2eb0c754618c
parent1dc510d190f59d47ba540804780ae0827660a789
parent9beecfbfae4fc384f3901a140b6d30d21cb23bd2
Merge tag 'upstream/2.2'

Upstream version 2.2

Conflicts:
CMakeLists.txt
src/fft.cpp
CMakeLists.txt.orig
src/fft.cpp.orig