summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-03-26 14:04:00 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-03-26 14:04:00 +0000
commitbec81c1e4b46a9487f0e312c2fa6cad3e0693799 (patch)
tree936daf63a94c1031aaa707b9a25d98d39f1fa7e3 /conf/machine
parentc86759af98a513b368c047195d2a923164f98c25 (diff)
parent9cb14015c6fb87732da5bb5f35b45fb1a0774a3f (diff)
merge of '62a647370dd26246593ae04455db0739130db23f'
and 'e6c88d0f2de01b99540e3d6ea77dbc6569a517ce'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/om-gta01.conf (renamed from conf/machine/fic-gta01.conf)0
-rw-r--r--conf/machine/om-gta02.conf (renamed from conf/machine/fic-gta02.conf)0
2 files changed, 0 insertions, 0 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/om-gta01.conf
index bfaf5ed793..bfaf5ed793 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/om-gta01.conf
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/om-gta02.conf
index 2c2034b1b6..2c2034b1b6 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/om-gta02.conf