projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
f6f54d7
)
Merge remote-tracking branch 'uniarch/master' into multiarch
author
Keith Packard
<keithp@keithp.com>
Fri, 7 Oct 2011 14:40:14 +0000
(08:40 -0600)
committer
Keith Packard
<keithp@keithp.com>
Fri, 7 Oct 2011 14:40:14 +0000
(08:40 -0600)
Conflicts:
src/core/ao_cmd.c
Use ao_arch_reboot after waiting for a second
No differences found