galaktos: -distribute fftsg.h

	  -get rid of bad merge remnant

modules/visualization/galaktos/Modules.am

@@ -11,7 +11,7 @@ SOURCES_galaktos = plugin.c plugin.h \
                    eval.c eval.h \
                    init_cond.c init_cond.h init_cond_types.h \
                    PCM.c PCM.h \
-                   fftsg.c \
+                   fftsg.c fftsg.h \
                    per_frame_eqn.c per_frame_eqn.h per_frame_eqn_types.h \
                    splaytree.c splaytree.h splaytree_types.h \
                    custom_shape.c custom_shape.h custom_shape_types.h \

modules/visualization/galaktos/fftsg.c

@@ -805,11 +805,8 @@ void makect(int nc, int *ip, double *c)
 #define CDFT_4THREADS_BEGIN_N 524288
 #endif
 #include <windows.h>
-<<<<<<< .working
 #include <stdlib.h>
-=======
 #include <stdio.h>
->>>>>>> .merge-right.r21326
 #define cdft_thread_t HANDLE
 #define cdft_thread_create(thp,func,argp) { \
     DWORD thid; \