Changeset 493a666a997611bba1e0d6d27a88e7835112c9e0

Show
Ignore:
Timestamp:
08/10/07 19:26:51 (1 year ago)
Author:
Christophe Mutricy <xtophe@videolan.org>
git-committer:
Christophe Mutricy <xtophe@videolan.org> 1191864411 +0000
git-parent:

[36eedf407fcec5b1e377ada3654de1ab633cc53e]

git-author:
Christophe Mutricy <xtophe@videolan.org> 1191864411 +0000
Message:

galaktos: -distribute fftsg.h

-get rid of bad merge remnant

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/visualization/galaktos/Modules.am

    rbfb8936 r493a666  
    1212                   init_cond.c init_cond.h init_cond_types.h \ 
    1313                   PCM.c PCM.h \ 
    14                    fftsg.c \ 
     14                   fftsg.c fftsg.h \ 
    1515                   per_frame_eqn.c per_frame_eqn.h per_frame_eqn_types.h \ 
    1616                   splaytree.c splaytree.h splaytree_types.h \ 

  • modules/visualization/galaktos/fftsg.c

    r8139b90 r493a666  
    806806#endif 
    807807#include <windows.h> 
    808 <<<<<<< .working 
    809808#include <stdlib.h> 
    810 ======= 
    811809#include <stdio.h> 
    812 >>>>>>> .merge-right.r21326 
    813810#define cdft_thread_t HANDLE 
    814811#define cdft_thread_create(thp,func,argp) { \