aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2011-07-12 20:45:56 -0700
committerPaul Eggert2011-07-12 20:45:56 -0700
commit89bfafe5d3e767c2f014b2738196411f8ba39d28 (patch)
treeb7ac7e72d430cebfc414d143e98a664b113ad4b2 /etc
parent5adf60bc2313a220185c9f22d3d539a0dc51b228 (diff)
parentcd18e7e3f49c014b83ffa5f2e4391a58ded6a287 (diff)
downloademacs-89bfafe5d3e767c2f014b2738196411f8ba39d28.tar.gz
emacs-89bfafe5d3e767c2f014b2738196411f8ba39d28.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/compilation.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 0eb3fe1bda2..888c1f94c33 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -254,6 +254,7 @@ foo.c:8.23-45: Informational: message
254foo.c:8-23: message 254foo.c:8-23: message
255foo.c:8-45.3: message 255foo.c:8-45.3: message
256foo.c:8.23-9.1: message 256foo.c:8.23-9.1: message
257foo.el:3:1:Error: End of file during parsing
257jade:dbcommon.dsl:133:17:E: missing argument for function call 258jade:dbcommon.dsl:133:17:E: missing argument for function call
258G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. 259G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.
259file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. 260file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.