summaryrefslogtreecommitdiff
path: root/resourceproto
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-06 14:18:27 -0700
committerKeith Packard <keithp@keithp.com>2010-04-06 14:18:27 -0700
commitaa3ba7f0bf64d59a617cf70c6da748d8b440e32b (patch)
tree8a443018445d33223d786a7ec6c64e16649431c2 /resourceproto
parent06e666b9008372a128b31ab00f17e0fc1bff86ad (diff)
parentfd5e146b6ddceb36f3de48638b836cacaee84839 (diff)
Merge remote branch 'xineramaproto/master'
Diffstat (limited to 'resourceproto')
0 files changed, 0 insertions, 0 deletions