diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 15:32:38 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 15:32:38 -0300 |
| commit | 995dab37c4558447073ea6cb2c6ef7b89849912c (patch) | |
| tree | 1b37cc72fc3a796bfa2856c7f710f978304b3a84 /extra/opencv/gcc46.patch | |
| parent | 20604a1579dcd51b5a46fc7d09cf4b1535219446 (diff) | |
| parent | 1a1b748f1738b1989a834d75b1623be21bf9bab5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-datetime-format-iso8601/PKGBUILD
extra/kde-agent/PKGBUILD
extra/labplot/PKGBUILD
Diffstat (limited to 'extra/opencv/gcc46.patch')
| -rw-r--r-- | extra/opencv/gcc46.patch | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/extra/opencv/gcc46.patch b/extra/opencv/gcc46.patch deleted file mode 100644 index a69499b4f..000000000 --- a/extra/opencv/gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp -=================================================================== ---- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804) -+++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861) -@@ -56,4 +56,5 @@ - #include <algorithm> - #include <cmath> -+#include <cstddef> - #include <complex> - #include <map> |