]> rtime.felk.cvut.cz Git - arc.git/commit
Bad merge fixed from 1618:6a28ae7576acbab8bb569e06907f01ea63232d4c
authormahi <devnull@localhost>
Sun, 29 Apr 2012 13:09:58 +0000 (15:09 +0200)
committermahi <devnull@localhost>
Sun, 29 Apr 2012 13:09:58 +0000 (15:09 +0200)
commit2c6e55f4f362476c046a9bebe1ca74a26074908d
treea8ceaa217f81220fb7e9dcc5b9aae083d59a2872
parent0c640203b0c8ea4c55b46d8ef8e757aca702d0b7
Bad merge fixed from 1618:6a28ae7576acbab8bb569e06907f01ea63232d4c
boards/board_common.mk