![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 06:57:19 +0000 (22:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 06:57:19 +0000 (22:57 -0800) | ||
| commit | 357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6 | |
| tree | 494aaff8a38b7d71c9b23b8c4176b27de433e3fb | tree | snapshot |
| parent | b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5 | commit | diff |
| parent | 37e7793d473019eac69c347f1a79e3273567b9bf | commit | diff |
Merge branch 'tr/userdiff-c-returns-pointer'
* tr/userdiff-c-returns-pointer:
userdiff: allow * between cpp funcname words
* tr/userdiff-c-returns-pointer:
userdiff: allow * between cpp funcname words
| userdiff.c | diff1 | | diff2 | | blob | history |