Merge branch 'bw/trace-no-inline-getnanotime'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:45 +0000 (14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:45 +0000 (14:16 -0700)
No file-scope static variables in an inlined function, please.

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

1  2 
trace.c
diff --cc trace.c
Simple merge