Chris Collins 1175f65cb0 Merge pull request #10162 from vladest/goto-white-buttons-fix ... Check if offset outside image, set to last image		2017-04-07 15:58:48 -07:00
..
external
i18n
icon
resources	Merge pull request #10162 from vladest/goto-white-buttons-fix	2017-04-07 15:58:48 -07:00
src	Merge pull request #9938 from kunalgosar/jsRenderBug	2017-04-07 13:44:03 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
interface.exe.manifest