From: Shawn O. Pearce Date: Thu, 9 Oct 2008 18:01:51 +0000 (-0700) Subject: Merge branch 'js/objc-funchdr' X-Git-Tag: v1.6.1-rc1~157 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23abd3f48cb217d1558fa1984bfa8c502717c08f Merge branch 'js/objc-funchdr' * js/objc-funchdr: Teach git diff about Objective-C syntax --- 23abd3f48cb217d1558fa1984bfa8c502717c08f