From: Junio C Hamano Date: Thu, 16 Oct 2014 21:16:45 +0000 (-0700) Subject: Merge branch 'bw/trace-no-inline-getnanotime' X-Git-Tag: v2.2.0-rc0~44 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c11dc64722fc0bb496efb1b6de87012a132c04fc?hp=--cc 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" --- c11dc64722fc0bb496efb1b6de87012a132c04fc