Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital

Conflicts:
	gr-digital/lib/Makefile.am
	gr-digital/python/__init__.py

1 files changed, 0 insertions, 33 deletions

diff --git a/gr-digital/lib/digital_api.h b/gr-digital/lib/digital_api.h
deleted file mode 100644
index d45ace13f..000000000
--- a/gr-digital/lib/digital_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_DIGITAL_API_H
-#define INCLUDED_DIGITAL_API_H
-
-#include <gruel/attributes.h>
-
-#ifdef gnuradio_digital_EXPORTS
-#  define DIGITAL_API __GR_ATTR_EXPORT
-#else
-#  define DIGITAL_API __GR_ATTR_IMPORT
-#endif
-
-#endif /* INCLUDED_DIGITAL_API_H */