diff options
author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
---|---|---|
committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
commit | 97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53 (patch) | |
tree | b85aa67a9968cf37c1ea5a0e38545f77ebd01b00 /fftw | |
parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz |
Fix conflict
Diffstat (limited to 'fftw')
-rw-r--r-- | fftw/fftw.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fftw/fftw.ini b/fftw/fftw.ini index d8a6595..f1454a1 100644 --- a/fftw/fftw.ini +++ b/fftw/fftw.ini @@ -16,7 +16,7 @@ number : 4 [requirements] build : - #none + gcc >=4.6 [osx] run : pkgconfig |