summaryrefslogtreecommitdiff
path: root/timer.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-02-03 12:40:29 +0100
committerLennart Poettering <lennart@poettering.net>2010-02-03 12:40:29 +0100
commit911081dde7ec28b28bfed7e08ab901158c18712d (patch)
tree953fd719dbd31f98a2e3ce40370119fd752b584c /timer.c
parent2b53c70b6429868029048244b8d21769148375e1 (diff)
parent66ee3769cb71e55bb9bea36348cb80282674a158 (diff)
Merge remote branch 'kay/master'
Diffstat (limited to 'timer.c')
0 files changed, 0 insertions, 0 deletions