summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-07-02 11:16:56 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-07-02 11:16:56 +0000
commit102eaa322eb18302832a1059e8ba1f12aeb5a679 (patch)
treea5c3293a3b9bce431d490c6ae6bda589c82267dd /conf/machine
parent5277518d2a2ca1d93bda682afe60bc7846756c41 (diff)
parent1f8940a24bafee2acced9263def2a0816155cd60 (diff)
merge of '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
and '61916fde303a24e027564cf07127b974edcf2ce8'
Diffstat (limited to 'conf/machine')
0 files changed, 0 insertions, 0 deletions