Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: ports/emacs-x/pkg_info

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/devenv/tests/devenv_small_test.cc ('k') | ports/emacs/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/emacs-x/pkg_info
diff --git a/ports/emacs-x/pkg_info b/ports/emacs-x/pkg_info
index 66d80d06c14a91464fc39601ff3c201ee33448f9..1454c99e14d6caa272f4ccae068eb9aeb82c2be1 100644
--- a/ports/emacs-x/pkg_info
+++ b/ports/emacs-x/pkg_info
@@ -10,3 +10,4 @@ SHA1=3c672a176df06e20d2661058ad49893f184b4956
# Disabled for bionic due to bash.
DISABLED_LIBC=(bionic)
DISABLED_TOOLCHAIN=(emscripten pnacl)
+CONFLICTS=(emacs)
« no previous file with comments | « ports/devenv/tests/devenv_small_test.cc ('k') | ports/emacs/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698