Merge branch 'directxtex'

author José Fonseca <jfonseca@vmware.com>

Wed, 6 Mar 2013 11:46:41 +0000 (11:46 +0000)

committer José Fonseca <jfonseca@vmware.com>

Wed, 6 Mar 2013 11:46:41 +0000 (11:46 +0000)
author José Fonseca <jfonseca@vmware.com>
Wed, 6 Mar 2013 11:46:41 +0000 (11:46 +0000)
committer José Fonseca <jfonseca@vmware.com>
Wed, 6 Mar 2013 11:46:41 +0000 (11:46 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc retrace/CMakeLists.txt
Simple merge
author	José Fonseca <jfonseca@vmware.com>
	Wed, 6 Mar 2013 11:46:41 +0000 (11:46 +0000)
committer	José Fonseca <jfonseca@vmware.com>
	Wed, 6 Mar 2013 11:46:41 +0000 (11:46 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
retrace/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history