Philip Rosedale e4924cdca8 Merge pull request #2202 from birarda/authentication ... remove deprecated qt5 methods in CMakeList files		2014-03-04 18:30:22 -08:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels	2014-03-03 16:47:42 -08:00
CMakeLists.txt	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00