Merge branch 'codec'
authorkt920.kim <kt920.kim@samsung.com>
Wed, 7 Dec 2011 17:04:29 +0000 (02:04 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Wed, 7 Dec 2011 17:04:29 +0000 (02:04 +0900)
commit6b9ea2853cb63725d3cafe7e840990218641aa0f
tree7b30e3b3a2a913486f353451ac9566a9c8cd0faa
parent5d948606c6c0a9483fe06c446e928f8d34fd20aa
parent7f1c3b1e390c56593d026e0a52232ef04e3287c1
Merge branch 'codec'

Conflicts:
Makefile.target
qemu_configure.sh
Makefile.target
configure
console.h
hw/brightness.c
hw/pc.c
hw/pc.h
hw/svcamera_pci.c
qemu_configure.sh