[CST] Focus b9bc799cf1 fix conflicts

2012-03-20 11:14:05 +04:00

..

bmp.cpp

Fix fd leak

2011-12-08 14:27:25 +00:00

crw.cpp

memcpy -> memmove

2011-03-09 12:55:31 +00:00

fb_display.cpp

memcpy -> memmove

2011-03-09 12:55:31 +00:00

fb_display.h

…

gif.cpp

memcpy -> memmove

2011-03-09 12:55:31 +00:00

jpeg.cpp

get rid of HAVE_DVB_API_VERSION define

2011-03-12 12:36:13 +00:00

make15color_errdiff.cpp

…

Makefile.am

driver: fix compile after include change.

2012-03-04 15:50:19 +08:00

pictureviewer.cpp

* Moviebrowser: disabled 'pseudo' transparency for display screenshot

2012-03-19 21:40:03 +00:00

pictureviewer.h

* Moviebrowser: disabled 'pseudo' transparency for display screenshot

2012-03-19 21:40:03 +00:00

picv_client_server.h

…

png.cpp

- printf, which are unnecessary from pictureviewer.cpp and png.cpp removed

2011-10-19 20:28:01 +00:00

pv_config.h

pictureviewer: rename config.h to pv_config.h

2011-01-08 22:37:13 +00:00

resize.cpp

memcpy -> memmove

2011-03-09 12:55:31 +00:00