summaryrefslogtreecommitdiff
path: root/admin/CPP-DEFINES
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
commita3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3 /admin/CPP-DEFINES
parent7f818df9420a1320539f7e3e633003573a570413 (diff)
parent721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
downloademacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip
Merge from mainline.
Diffstat (limited to 'admin/CPP-DEFINES')
-rw-r--r--admin/CPP-DEFINES1
1 files changed, 0 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 0346bb2e620..7febc93bb33 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -382,4 +382,3 @@ wait
write
xfree
-# arch-tag: bc80061a-1168-4911-9766-46aaf2640250