← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/ascii/ascii.cc

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/ascii/ascii.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <config.h>
21
21
 
22
22
#include <drizzled/plugin.h>
23
23
#include <drizzled/function/math/int.h>