Merge remote-tracking branch 'anholt/ephyr-fixes'
authorKeith Packard <keithp@keithp.com>
Fri, 4 Oct 2013 21:04:48 +0000 (14:04 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 4 Oct 2013 21:04:48 +0000 (14:04 -0700)
1  2 
configure.ac
hw/kdrive/ephyr/ephyr.c
hw/kdrive/ephyr/ephyrinit.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge