projects
/
osmocom-bb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af23c78
c4483bf
)
Merge branch 'sylvain/testing' of git://git.osmocom.org/osmocom-bb into testing
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Tue, 18 Jan 2011 16:29:19 +0000
(17:29 +0100)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Tue, 18 Jan 2011 16:29:19 +0000
(17:29 +0100)
Conflicts:
src/target/firmware/apps/simtest/main.c
Trivial merge
projects / osmocom-bb.git / commitdiff