summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-06-16 11:43:36 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-06-16 11:43:36 +0000
commita42b26fd478a07ea163770e4f3238fe40cbe97a3 (patch)
tree6be5e7244593dc044a5d3ed3c8fd16415b518224 /conf/machine
parent92a95e65fd8a2ff4b324c512879811701cf40209 (diff)
parent6aa1da7195d52f261dad2edcc1db526f06bb5e59 (diff)
merge of '6d659ab83a5262d1e21010e8ef7628a905dfff84'
and '9923a1dbe2ed8c727cb2a236afa5262aaa83fb19'
Diffstat (limited to 'conf/machine')
0 files changed, 0 insertions, 0 deletions