Merge branch 'bw/trace-no-inline-getnanotime'
commitc11dc64722fc0bb496efb1b6de87012a132c04fc
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:45 +0000 (16 14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:45 +0000 (16 14:16 -0700)
tree59b5faa329e694740dec3ca0c48bee4ad2aafe21
parent1cb3324e6152f3b35a7175b84a82b714290090fa
parent6433d569753e8d33d3f7beca16a65f2fc481aade
Merge branch 'bw/trace-no-inline-getnanotime'

No file-scope static variables in an inlined function, please.

* bw/trace-no-inline-getnanotime:
  trace.c: do not mark getnanotime() as "inline"
trace.c