Merge branch 'gsoc-dir-split' into gsoc-android-botloader
commitcaa2e6984f7cba10f2b2a6cbad7e3c43651ce618
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sun, 1 Aug 2010 16:08:42 +0000 (1 18:08 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sun, 1 Aug 2010 16:08:42 +0000 (1 18:08 +0200)
tree6bfe5e766995aa2f247603d5db251d06ccfcae8e
parent8d0ec86998a530c7640384c0d78a04ba3fad07fc
parent3eac8c6a59017a6ae2990aa63d25667a50023ec4
Merge branch 'gsoc-dir-split' into gsoc-android-botloader

Conflicts:
tools/configure
firmware/export/audiohw.h
tools/configure