projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4ed53ef
fc4173f
)
Merge remote-tracking branch 'origin/master' into multiarch
author
Keith Packard
<keithp@keithp.com>
Fri, 7 Oct 2011 14:34:59 +0000
(08:34 -0600)
committer
Keith Packard
<keithp@keithp.com>
Fri, 7 Oct 2011 14:34:59 +0000
(08:34 -0600)
Conflicts:
configure.ac
Fix version number and location of ao.h header
Trivial merge