Daniele Panozzo bd29dddc76 Merge commit 'cdcf34637fa2d9c3039f28c455e26fe5edbfa1a4 [formerly 2341af78ca]' ...

Conflicts:
	tutorial/607_LIM/main.cpp

- viewer timer is now cross platform
- glew is now properyl included in all the viewer files


Former-commit-id: 8505d91055

2014-06-30 16:40:27 +02:00

..

CMakeLists.txt

Merge commit '9f6c5cdbda735487398f11b323082d46d30b1466 [formerly e63f9f14e9]'

2014-06-30 13:00:59 +02:00

main.cpp

Merge commit 'cdcf34637fa2d9c3039f28c455e26fe5edbfa1a4 [formerly 2341af78ca]'

2014-06-30 16:40:27 +02:00