Marc-André Moreau 2a5192b027 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx ...

Conflicts:
	client/Windows/wf_cliprdr.h
	client/Windows/wf_event.h
	client/X11/xf_client.c
	client/X11/xf_gdi.c
	libfreerdp/gdi/gdi.c
	server/Mac/mf_input.c

2014-09-17 19:09:56 -04:00

..

bitmap.c

Removed remaining printf and DEBUG_* usages.

2014-09-15 09:01:05 +02:00

brush.c

Replaced logging in libfreerdp with wlog defines.

2014-09-15 08:48:46 +02:00

cache.c

libfreerdp-utils: purge old STREAM utils

2013-03-21 16:45:25 -04:00

CMakeLists.txt

libfreerdp: always build "MONOLITHIC"

2014-09-12 00:19:53 +02:00

glyph.c

Replaced logging in libfreerdp with wlog defines.

2014-09-15 08:48:46 +02:00

nine_grid.c

Replaced logging in libfreerdp with wlog defines.

2014-09-15 08:48:46 +02:00

offscreen.c

Replaced logging in libfreerdp with wlog defines.

2014-09-15 08:48:46 +02:00

palette.c

Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

2014-09-17 19:09:56 -04:00

pointer.c

Replaced logging in libfreerdp with wlog defines.

2014-09-15 08:48:46 +02:00