Merge pull request #114 from llyzs/tsmf

author Marc-André Moreau <marcandre.moreau@gmail.com>

Tue, 20 Sep 2011 15:33:38 +0000 (08:33 -0700)

committer Marc-André Moreau <marcandre.moreau@gmail.com>

Tue, 20 Sep 2011 15:33:38 +0000 (08:33 -0700)
author Marc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Sep 2011 15:33:38 +0000 (08:33 -0700)
committer Marc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Sep 2011 15:33:38 +0000 (08:33 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc client/X11/xfreerdp.c
Simple merge
author	Marc-André Moreau <marcandre.moreau@gmail.com>
	Tue, 20 Sep 2011 15:33:38 +0000 (08:33 -0700)
committer	Marc-André Moreau <marcandre.moreau@gmail.com>
	Tue, 20 Sep 2011 15:33:38 +0000 (08:33 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
client/X11/xfreerdp.c	patch \|	diff1 \|	diff2 \|	blob \| history