comparison util/timer.lua @ 7269:cde4ef90cf3d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 11 Mar 2016 13:41:10 +0100
parents 17e275e8bd79
children 5632aa85e0b6
comparison
equal deleted inserted replaced
7263:015a711a8ccf 7269:cde4ef90cf3d