diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-23 16:03:50 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-23 16:03:50 +0100 |
| commit | b5ada7e3c038bab1dc0b60a532451c30616e981a (patch) | |
| tree | 1a40faefd8f706b7c44c78ae94d71232c84d2162 /plugins/ffap | |
| parent | 0ebcf8bc7dcc9f8e71ce23c608e95e23e77d66c9 (diff) | |
| parent | 9be49f3f078dbe9668c8c40b7171a0d039f19682 (diff) | |
Merge branch 'master' into devel
Conflicts:
Makefile.am
Diffstat (limited to 'plugins/ffap')
| -rw-r--r-- | plugins/ffap/ffap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c index 6a18ec35..0a4e3276 100644 --- a/plugins/ffap/ffap.c +++ b/plugins/ffap/ffap.c @@ -33,7 +33,7 @@ #include <string.h> #include <limits.h> #include <stdlib.h> -#include <alloca.h> +//#include <alloca.h> #include <assert.h> #include "../../deadbeef.h" |