Merge remote-tracking branch 'origin/user/rustico/fishpass' into mult…

…inode Conflicts: .gitignore src/ParticleSystem.cc src/Waterfall.cc src/buildneibs.cu src/buildneibs.cuh src/buildneibs_kernel.cu src/euler.cu src/euler.cuh src/euler_kernel.cu src/forces.cu
GPUSPH · Jun 19, 2013 · 0b0b8b6 · 0b0b8b6
1 parent 8335006
commit 0b0b8b6
Show file tree

Hide file tree

Showing 33 changed files with 6,499 additions and 432 deletions.
diff --git a/Doxygen_settings b/Doxygen_settings
diff --git a/other/Fishpass measures.svg b/other/Fishpass measures.svg
diff --git a/scripts/sprunge b/scripts/sprunge
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+url=$(curl -s -F 'sprunge=<-' http://sprunge.us < /dev/stdin)
+echo $url | xclip > /dev/null 2>&1
+echo $url
+