Merge branch 'features/brillcodec_2i' into 'tizen_next' 82/31082/1
authorKitae Kim <kt920.kim@samsung.com>
Mon, 1 Dec 2014 08:10:20 +0000 (17:10 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Mon, 1 Dec 2014 09:43:24 +0000 (18:43 +0900)
commit36f8c9f021f5f8b3534160b39f29f316c73a4e63
tree316930d9f57cd30f31d2d22ece9874488aac5274
parente8aa4769f6f4c2dc0683b4a8b3d4360635ea25ee
parenta60014ebd51c1ba78cad9f8ffcac5821bef4c2b0
Merge branch 'features/brillcodec_2i' into 'tizen_next'

Conflicts:
configure
package/changelog
package/pkginfo.manifest
target-i386/hax-all.c
tizen/src/Makefile
tizen/src/display/maru_display.c
tizen/src/display/maru_sdl.c
tizen/src/display/maru_shm.c
tizen/src/display/maru_shm.h
tizen/src/eventcast/encode_fb.c
tizen/src/eventcast/encode_fb.h
tizen/src/eventcast/touch.c
tizen/src/eventcast/touch.h
tizen/src/hw/pci/Makefile.objs
tizen/src/hw/pci/maru_brillcodec.c
tizen/src/hw/pci/maru_brillcodec.h
tizen/src/hw/pci/maru_brillcodec_device.c
tizen/src/tethering/Makefile.objs
tizen/src/tethering/common.c
tizen/src/util/new_debug_ch.c
tizen/src/util/osutil.h
vl.c

Change-Id: Iab1486003ec796882e52647d08518624db664cdc
configure
tizen/emulator_configure.sh
tizen/src/Makefile
tizen/src/hw/pci/Makefile.objs