summaryrefslogtreecommitdiff
path: root/extra/eclipse
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-03 13:57:40 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-03 13:57:40 -0300
commitcdd88c937bb1fd3bf6de0b847101524a2d5c9022 (patch)
tree3eeb67878db60db79eb21dc2232377e6b56a3add /extra/eclipse
parentb2e7dca27f9de046feecd59ecfc93cd17bca8356 (diff)
parentb618c3d0693aec564c6746238fd05d94e31d3b76 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/asciijump/PKGBUILD community/cairo-compmgr/PKGBUILD community/cwiid/PKGBUILD community/darcs/PKGBUILD community/gadmin-samba/PKGBUILD community/gstm/PKGBUILD community/haskell-dbus/PKGBUILD community/haskell-mmap/PKGBUILD community/lastfm-client/PKGBUILD community/libtar/PKGBUILD community/mget/PKGBUILD community/nexuiz/PKGBUILD community/pstreams/PKGBUILD community/pyglet/PKGBUILD community/python-html5lib/PKGBUILD community/python-pychm/PKGBUILD community/qoauth/PKGBUILD community/quilt/PKGBUILD community/stormbaancoureur/PKGBUILD community/winegame/PKGBUILD community/winestuff/PKGBUILD community/xdg-user-dirs/PKGBUILD core/libfetch/PKGBUILD extra/acpi/PKGBUILD extra/alex/PKGBUILD extra/allegro/PKGBUILD extra/capi4k-utils/PKGBUILD extra/erlang/PKGBUILD extra/ettercap/PKGBUILD extra/gftp/PKGBUILD extra/gimp-refocus/PKGBUILD extra/happy/PKGBUILD extra/haskell-cgi/PKGBUILD extra/haskell-deepseq/PKGBUILD extra/haskell-fgl/PKGBUILD extra/haskell-glut/PKGBUILD extra/haskell-haskell-src/PKGBUILD extra/haskell-html/PKGBUILD extra/haskell-hunit/PKGBUILD extra/haskell-opengl/PKGBUILD extra/haskell-parallel/PKGBUILD extra/haskell-platform/PKGBUILD extra/haskell-quickcheck/PKGBUILD extra/haskell-regex-base/PKGBUILD extra/haskell-regex-compat/PKGBUILD extra/haskell-regex-posix/PKGBUILD extra/haskell-stm/PKGBUILD extra/haskell-syb/PKGBUILD extra/haskell-xhtml/PKGBUILD extra/libnet/PKGBUILD extra/linux_logo/PKGBUILD extra/mailman/PKGBUILD extra/midori/PKGBUILD extra/ntrack/PKGBUILD extra/pwgen/PKGBUILD extra/qtcurve-gtk2/PKGBUILD extra/qtcurve-kde4/PKGBUILD extra/ristretto/PKGBUILD extra/rxvt-unicode/PKGBUILD extra/telepathy-sofiasip/PKGBUILD extra/tightvnc/PKGBUILD extra/vsftpd/PKGBUILD extra/windowmaker-crm-git/PKGBUILD libre/aufs2-libre/PKGBUILD libre/calibre-libre/PKGBUILD libre/calibre-libre/calibre-mount-helper libre/calibre-libre/calibre.install libre/calibre-libre/desktop_integration.patch libre/ffmpeg-libre/PKGBUILD mozilla-testing/iceweasel-libre/PKGBUILD mozilla-testing/iceweasel-libre/libre.patch mozilla-testing/iceweasel-libre/mozconfig ~lukeshu/openni-unstable/PKGBUILD
Diffstat (limited to 'extra/eclipse')
-rw-r--r--extra/eclipse/eclipse.ini.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/extra/eclipse/eclipse.ini.patch b/extra/eclipse/eclipse.ini.patch
deleted file mode 100644
index 0f2e3b226..000000000
--- a/extra/eclipse/eclipse.ini.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- eclipse/eclipse.ini 2010-06-24 09:22:59.474998451 +0200
-+++ eclipse/eclipse.ini~ 2010-06-24 09:24:26.325011998 +0200
-@@ -5,9 +5,9 @@
- -showsplash
- org.eclipse.platform
- --launcher.XXMaxPermSize
--256m
-+512m
- --launcher.defaultAction
- openFile
- -vmargs
- -Xms40m
---Xmx384m
-+-Xmx768m