]> Devoid-pointer.net GitWeb - omnibook.git/commit
Merge branch (81:HEAD) back to trunk
authorMathieu Bérard <mathieu.berard@crans.org>
Wed, 16 Aug 2006 20:47:45 +0000 (20:47 +0000)
committerMathieu Bérard <mathieu.berard@crans.org>
Wed, 16 Aug 2006 20:47:45 +0000 (20:47 +0000)
commit4253d35fd213deb505a1646268495ca0e62f55c5
tree96d66a910f0eb216f57152e2e42c0910644c598f
parentd6f33ac6a201caef3f95e2dcc6e173df9bb557ce
Merge branch (81:HEAD) back to trunk
Resolve conflics (why so much hate ?)
28 files changed:
Makefile
ac.c
apmemu.c
battery.c
blank.c
compal.c [new file with mode: 0644]
debian/docs
display.c
doc/CREDITS
doc/ChangeLog
doc/README
doc/README-2.6 [deleted file]
doc/README-Hotkeys [moved from doc/README-OneTouch with 80% similarity]
doc/TODO
dock.c
ec.c
ec.h
fan.c
fan_policy.c
hotkeys.c [new file with mode: 0644]
info.c
init.c
lcd.c
omnibook.h
onetouch.c [deleted file]
sections.lds
temperature.c
touchpad.c