Clément Brisset 17e5b441cf Merge pull request #111 from huffman/atp-manager-name ... Add atp filename to entities added to world		2016-03-15 10:19:53 -07:00
..
external
i18n
icon
resources	Merge pull request #111 from huffman/atp-manager-name	2016-03-15 10:19:53 -07:00
src	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-15 10:19:20 -07:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	manually install OpenSSL DLLs for Qt	2016-03-03 17:57:34 -08:00