Merge branch 'js/objc-funchdr'
commit23abd3f48cb217d1558fa1984bfa8c502717c08f
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 18:01:51 +0000 (9 11:01 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 18:01:51 +0000 (9 11:01 -0700)
tree10d4300c9700ee80d5538c4f302cac16aa7cd914
parent01ed1079f3fae37eda7e0e0dcab9b74b34e9327e
parent5d1e958e2467ef295637844fd85be7a8ab187ef1
Merge branch 'js/objc-funchdr'

* js/objc-funchdr:
  Teach git diff about Objective-C syntax