projects
/
libam7xxx.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
ce836a4
6196fa7
)
Merge branch 'rettichschnidi' into android
android
author
Reto Schneider <github@reto-schneider.ch>
Sun, 8 Jul 2012 20:57:28 +0000
(22:57 +0200)
committer
Reto Schneider <github@reto-schneider.ch>
Sun, 8 Jul 2012 20:57:28 +0000
(22:57 +0200)
Trivial merge