simpad: merge simpad-2.6.inc in simpad.conf
commitac99aeee694e04321664c3fcba2ce6cf39ce160a
authorAndrea Adami <andrea.adami@gmail.com>
Wed, 6 Oct 2010 22:57:22 +0000 (7 00:57 +0200)
committerAndrea Adami <andrea.adami@gmail.com>
Wed, 6 Oct 2010 22:57:22 +0000 (7 00:57 +0200)
tree2beb0c158f2468ecaa97d8e9fcb1111ec2ae6a74
parenta934499cee7c8201e303feb22f45e0f28a8e9a7b
simpad: merge simpad-2.6.inc in simpad.conf
conf/machine/include/simpad-2.6.inc [deleted file]
conf/machine/simpad.conf