from Sebastian
authorSteve Youngs <steve@sxemacs.org>
Fri, 6 Jan 2012 23:39:08 +0000 (09:39 +1000)
committerSteve Youngs <steve@sxemacs.org>
Fri, 6 Jan 2012 23:39:08 +0000 (09:39 +1000)
commitef802d6a7aa8e1d29357bd41326c2f1db957739d
treecf70d109964756f6d8bff644a16e6ebc73a6ab89
parentcd08c2c0259117d516cab062ff64d20ab749885f
parentea2ba4542f18d0ef911fc682061cd53b3ffca7d3
from Sebastian

* merges:
  Summary: chore, kick ase extern inline Keywords: code hygiene build clang
  Summary: chore, don't check for extern inline support anymore Keywords: code hygiene build clang
  Summary: chore, crunch the number of extern_inline definitions Keywords: code hygiene build clang
  Summary: chore, refactor nested function construct in event-Xt.c Keywords: build clang
  Summary: chore, replace nested function construct by cpp equivalent Keywords: build clang

Conflicts:
src/ui/X11/event-Xt.c  -- trivial, resolved.

Signed-off-by: Steve Youngs <steve@sxemacs.org>
src/ui/X11/event-Xt.c