tree 075ca6795fc65ac88b949dde126a4ec3d0056ef1
parent 406cc9b822b44a1d53c1a45536460992529aec88
parent 37e7793d473019eac69c347f1a79e3273567b9bf
author Junio C Hamano <gitster@pobox.com> 1324496565 -0800
committer Junio C Hamano <gitster@pobox.com> 1324496565 -0800

Merge branch 'tr/userdiff-c-returns-pointer' into maint

* tr/userdiff-c-returns-pointer:
  userdiff: allow * between cpp funcname words