Merge branch 'sylvain/testing' of git://git.osmocom.org/osmocom-bb into testing
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 18 Jan 2011 16:29:19 +0000 (17:29 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 18 Jan 2011 16:29:19 +0000 (17:29 +0100)
commit795bc74a7a1e89b67d55ceac19ccffb245980a0a
treea17043f37e1a5d3ed538c09a28a5bcd1fe8e787c
parentaf23c7847b275bf957e8aa5b7ee7f48b7ee9a63b
parentc4483bfed52ed42226f7f8a9f04968bafda1ba6c
Merge branch 'sylvain/testing' of git://git.osmocom.org/osmocom-bb into testing

Conflicts:
src/target/firmware/apps/simtest/main.c