resolve conflicts on merge with upstream master

This commit is contained in:
Stephen Birarda 2013-05-10 14:01:52 -07:00
parent 9ee3f889ab
commit a059e44011

View file

@ -86,9 +86,6 @@ include_directories(
${LIBOVR_INCLUDE_DIRS}
)
find_package(Qt4 REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES} ${LIBOVR_LIBRARY})
if (APPLE)