summaryrefslogtreecommitdiff
path: root/conf/machine/vmware.conf
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2010-12-20 15:36:05 -0600
committerJesse Gilles <jgilles@multitech.com>2010-12-20 15:36:05 -0600
commit60efa3a668c680f009643b0c158eda8687b47204 (patch)
tree1bd93ac070df28697a1416e09c6cbdfb30860617 /conf/machine/vmware.conf
parent1e1a240070eb3b6cb9e41d2c1998da06549e6a5f (diff)
parentee0e494d8f9fa65e1a1491423edbe60945e37dd1 (diff)
Merge branch 'multitech-corecdp-1.x' into multitech-corecdp-dev
Diffstat (limited to 'conf/machine/vmware.conf')
0 files changed, 0 insertions, 0 deletions