Merge from CEDET upstream.

1 files changed, 15 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index e31c7251ffb..f49061e35df 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,18 @@
+2013-12-12  David Engster  <deng@randomsample.de>
+
+        * grammars/c.by (expr-binop): Add MOD.
+        (variablearg): Add 'opt-assign'.
+        (variablearg, varnamelist): Add default values so that it can be
+        later expanded into the tag.
+        (opt-stuff-after-symbol): Rename to 'brackets-after-symbol' and
+        remove empty match.
+        (multi-stage-dereference): Adapt to above rename.
+        (unaryexpression): Use 'symbol' instead of 'namespace-symbol',
+        since the latter also leads to an empty match at the end which
+        would make this too greedy.
+        (variablearg-opt-name): Support parsing of function pointers
+        inside an argument list.
+
 2013-12-12  Glenn Morris  <rgm@gnu.org>
 
         * update_autogen (info_dir):