Skip to content

Commit

Permalink
Merging dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Praveen Elangovan committed Jan 5, 2018
2 parents 8edfec2 + 30080d7 commit 5de25d1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ find_package(Qt5OpenGL)
SET(QT_USE_QTOPENGL ON)
# find_package(Qt4)

find_package(OpenThreads)
find_package(ossim)
find_package(TIFF)
IF(BUILD_OSSIM_PLANET)
Expand Down
Empty file modified src/ossimGui/OpenImageUrlJob.cpp
100755 → 100644
Empty file.

0 comments on commit 5de25d1

Please sign in to comment.