[CMAKE]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 31 Dec 2010 16:54:37 +0000 (16:54 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 31 Dec 2010 16:54:37 +0000 (16:54 +0000)
commit161033b42936135a82c32306fcab58e844b4c6e1
tree6f12858306f755502a866424df400ca6783214fa
parent8c14a1744ac1257eb30ffee3c9f560107c17121f
[CMAKE]
Fix conflict artifacts.

svn path=/branches/cmake-bringup/; revision=50244
CMakeMacros.cmake