Merge branch 'bmx6_testing' into bmx6_testing_new_config
authorAxel Neumann <neumann@cgws.de>
Sun, 4 Aug 2013 06:25:07 +0000 (08:25 +0200)
committerAxel Neumann <neumann@cgws.de>
Sun, 4 Aug 2013 06:25:07 +0000 (08:25 +0200)
commit0fda0b049c88398e6b47e45be95553d638e81e54
treeb9d14bf1d6510e28b802192db4ab5f228f915f59
parentab61aa8a249c25f28936d1cce8907424e43e96c4
parent2812231fa4d81e7e9e2fc4a6f2980b91a007253d
Merge branch 'bmx6_testing' into bmx6_testing_new_config

Conflicts:
bmx6/Makefile