Merge branch 'master' into merge_bazaar

Conflicts:
	.gitignore
This commit is contained in:
Mark Borgerding
2018-07-21 12:14:02 -04:00
34 changed files with 310 additions and 127 deletions

View File

@ -1,3 +1,11 @@
/*
* Copyright (c) 2003-2010, Mark Borgerding. All rights reserved.
* This file is part of KISS FFT - https://github.com/mborgerding/kissfft
*
* SPDX-License-Identifier: BSD-3-Clause
* See COPYING file for more information.
*/
#ifndef KISSFFT_CLASS_HH
#define KISSFFT_CLASS_HH
#include <complex>