Merge branch 'tx48-rel' KARO-TX-2014-07-18
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 18 Jul 2014 12:48:59 +0000 (14:48 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 18 Jul 2014 12:48:59 +0000 (14:48 +0200)
commit26478f3fe784370a8b78445177ab0afece019ce2
tree445da7e65979fbf34afb905d026054793eb92d19
parent80eb56a884e0516236ee71c2c39008a2587d74c5
parentf7a6bbe059361dd785700bfed078179609fbfc7d
Merge branch 'tx48-rel'