diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-15 19:25:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-15 19:25:01 -0300 |
| commit | ecec4d4d3ca64d7929f1f63857e82268798e066b (patch) | |
| tree | dfc5421b1f5460a449502c66d612e1132ec5d49f /extra/scim-uim | |
| parent | eddd84528e605047a994ee8d652ba99686a412fc (diff) | |
| parent | 1ffabe284d9f5a4ac055941d9817af71be1e5b54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/binutils-avr/PKGBUILD
community/freecol/PKGBUILD
community/gcc-avr/PKGBUILD
community/lightspark/PKGBUILD
community/lorcon-old-svn/PKGBUILD
community/mdf2iso/PKGBUILD
community/pylorcon/PKGBUILD
community/qbittorrent/PKGBUILD
community/remmina-plugins/PKGBUILD
community/systemd/PKGBUILD
community/texmaker/PKGBUILD
extra/pyqt/PKGBUILD
extra/uim/PKGBUILD
extra/wesnoth/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
multilib-testing/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/libtool-multilib/libtool.install
testing/glibc/PKGBUILD
testing/shadow/PKGBUILD
testing/xf86-video-savage/PKGBUILD
Diffstat (limited to 'extra/scim-uim')
| -rw-r--r-- | extra/scim-uim/uim-1.5.5-header.diff | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/extra/scim-uim/uim-1.5.5-header.diff b/extra/scim-uim/uim-1.5.5-header.diff deleted file mode 100644 index 0e6565827..000000000 --- a/extra/scim-uim/uim-1.5.5-header.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp -+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp -@@ -34,7 +34,8 @@ - - #include <scim.h> - #include "scim_uim_imengine.h" --#include <uim/uim-compat-scm.h> -+#include <uim/uim-scm.h> -+#include <uim/uim-util.h> - - #define scim_module_init uim_LTX_scim_module_init - #define scim_module_exit uim_LTX_scim_module_exit - |