Merge branch 'master' of https://github.com/studouglas/GEANT4-GPU

studouglas · Apr 16, 2016 · e5f2e26 · e5f2e26
2 parents 3bc5655 + ec9c4b5
commit e5f2e26
Show file tree

Hide file tree

Showing 42 changed files with 1,049 additions and 173 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@
 *.log
 *.synctex.gz
 *.toc
+*.snm
+*.nav
+*.vrb
 Documentation/*/*.out
 
 # Xcode project files
@@ -23,6 +26,8 @@ G4STORK/include/*.msh
 G4STORK/OutputFiles
 G4STORK/SourceFiles
 
+geant4.10.02/source/**/CUDAGPU.hh
+
 # Executables
 */**/AnalyzeTestResults
 */**/GenerateTestResults

diff --git a/Documentation/FinalPresentation/Presentation.pdf b/Documentation/FinalPresentation/Presentation.pdf