Marc-André Moreau 6afd621d4c Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow ...

Conflicts:
	server/Mac/mf_audin.c
	server/Mac/mf_event.c
	server/Mac/mf_info.c
	server/Mac/mf_mountain_lion.c
	server/Mac/mf_peer.c
	server/Mac/mf_rdpsnd.c
	server/Mac/mfreerdp.c
	server/shadow/CMakeLists.txt

2014-09-17 20:15:01 -04:00

..

.gitignore

…

CMakeLists.txt

libfreerdp: always build "MONOLITHIC"

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

mf_audin.c

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

2014-09-17 20:15:01 -04:00

mf_audin.h

Fixed missing includes and invalid replacement.

2014-08-11 09:38:08 +02:00

mf_event.c

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

2014-09-17 20:15:01 -04:00

mf_event.h

…

mf_info.c

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

2014-09-17 20:15:01 -04:00

mf_info.h

Fixed missing includes and invalid replacement.

2014-08-11 09:38:08 +02:00

mf_input.c

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

2014-09-17 20:15:01 -04:00

mf_input.h

…

mf_interface.c

…

mf_interface.h

…

mf_mountain_lion.c

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

2014-09-17 20:15:01 -04:00

mf_mountain_lion.h

…

mf_peer.c

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

2014-09-17 20:15:01 -04:00

mf_peer.h

Fixed missing includes and invalid replacement.

2014-08-11 09:38:08 +02:00

mf_rdpsnd.c

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

2014-09-17 20:15:01 -04:00

mf_rdpsnd.h

Fixed missing includes and invalid replacement.

2014-08-11 09:38:08 +02:00

mfreerdp.c

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

2014-09-17 20:15:01 -04:00

mfreerdp.h

Fixed missing includes and invalid replacement.

2014-08-11 09:38:08 +02:00

ModuleOptions.cmake

…

server.crt

…

server.key

…