Merge branch 'master' of https://github.com/JanThorbecke/OpenSource
merge conflicts
No related branches found
No related tags found
Showing
- marchenko_applications/JespersRayTracer.c 2 additions, 2 deletionsmarchenko_applications/JespersRayTracer.c
- marchenko_applications/Makefile 26 additions, 8 deletionsmarchenko_applications/Makefile
- marchenko_applications/marchenko.c 193 additions, 119 deletionsmarchenko_applications/marchenko.c
- marchenko_applications/marchenko.h 1 addition, 1 deletionmarchenko_applications/marchenko.h
- marchenko_applications/raytime.c 10 additions, 1 deletionmarchenko_applications/raytime.c
- marchenko_applications/readTinvData.c 135 additions, 247 deletionsmarchenko_applications/readTinvData.c
- marchenko_full/Makefile 7 additions, 7 deletionsmarchenko_full/Makefile
- marchenko_full/marchenko.c 6 additions, 6 deletionsmarchenko_full/marchenko.c
Loading
Please register or sign in to comment