To get this branch, use:
bzr branch
http://darksoft.org/webbzr/tomo/pyhst
Viewing all changes in revision 49.
- Committer: root
- Date: 2011-02-07 13:09:48 UTC
- Revision ID: svn-v4:5b8db81b-ae59-44f8-ba89-bac8e790cc92::48
Merge /home/matthias/dev/pyHST
Conflicts:
trunk/src/CMakeLists.txt
trunk/src/debug.h
trunk/src/fastedf/FastEdf.c
trunk/src/filters/CMakeLists.txt
trunk/src/filters/SINO_Filter_Median.c
trunk/src/filters/SINO_Filter_Template.c
trunk/src/filters/interpola_filter.c
trunk/src/hst.c
trunk/src/hst.h
trunk/src/hst_cpu.c
trunk/src/hst_cpu.h
trunk/src/hst_cuda/hst_cuda.cu
trunk/src/hw_sched.c
trunk/src/hw_sched.h
trunk/src/hw_thread.c
trunk/src/setup.py
Conflicts:
trunk/src/CMakeLists.txt
trunk/src/debug.h
trunk/src/fastedf/FastEdf.c
trunk/src/filters/CMakeLists.txt
trunk/src/filters/SINO_Filter_Median.c
trunk/src/filters/SINO_Filter_Template.c
trunk/src/filters/interpola_filter.c
trunk/src/hst.c
trunk/src/hst.h
trunk/src/hst_cpu.c
trunk/src/hst_cpu.h
trunk/src/hst_cuda/hst_cuda.cu
trunk/src/hw_sched.c
trunk/src/hw_sched.h
trunk/src/hw_thread.c
trunk/src/setup.py
- files added:
- .gitignore
- trunk/src/docs/.svn
- trunk/src/docs/.svn/text-base
- trunk/src/hst_opencl
- files modified:
- trunk/src/CMakeLists.txt
expand all
collapse all
added
removed
