diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 12:04:09 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 12:04:09 -0300 |
| commit | bae3e33d2e446a83c2a1ec40e017a9378fe10ef0 (patch) | |
| tree | 7ca1b9e71febdb445097556529442c74e59b3746 /community/libghemical | |
| parent | 5a9eef758e9537d6f9913ed487686e8021a77808 (diff) | |
| parent | 8736f458a17a03cf79a763a0c8122f93162fed71 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dev86/PKGBUILD
community/diacanvas/PKGBUILD
community/gnunet-setup/PKGBUILD
community/hula/PKGBUILD
extra/libgnomecups/PKGBUILD
extra/libgnomeprint/PKGBUILD
extra/libgnomeprintui/PKGBUILD
extra/libmcs/PKGBUILD
extra/lv2core/PKGBUILD
extra/opencdk/PKGBUILD
Diffstat (limited to 'community/libghemical')
| -rw-r--r-- | community/libghemical/sasaeval.diff | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/community/libghemical/sasaeval.diff b/community/libghemical/sasaeval.diff deleted file mode 100644 index fe719f8d9..000000000 --- a/community/libghemical/sasaeval.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/sasaeval.cpp 2008-08-01 09:39:01.000000000 +0530 -+++ b/src/sasaeval.cpp 2008-08-01 09:40:33.000000000 +0530 -@@ -21,6 +21,8 @@ - #include "sasaeval.h" - - #include "engine.h" -+#include <algorithm> -+using namespace std; - - // the surface area code apparently contains some bugs, since it sometimes - // crashes. another possibility is that the surface area math contains some ---- a/src/sasaeval.h 2008-07-31 00:40:08.000000000 +0530 -+++ b/src/sasaeval.h 2008-08-01 09:40:04.000000000 +0530 -@@ -24,6 +24,7 @@ - #define SASAEVAL_H - - #include "typedef.h" -+#include <stdlib.h> - - struct cg_nbt3_nl; // SASA neighbor list. - |