Daniele Panozzo 8505d91055 Merge commit '2341af78cad7d594d7c3b1ebe91d8fb52ec19773' ...

Conflicts:
	tutorial/607_LIM/main.cpp

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

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

..

CMakeLists.txt

Merge commit 'e63f9f14e9bec7dae3918649b6773a460ac106f7'

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

main.cpp

Merge commit '2341af78cad7d594d7c3b1ebe91d8fb52ec19773'

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