Andrew Meadows b9c7d6351f Merge pull request #10135 from samcake/ambient ... Rename render::PendingChanges to render::Transaction		2017-04-07 09:54:10 -07:00
..
external
i18n
icon
resources	Merge pull request #10161 from howard-stearns/fix-pal-connections-help	2017-04-07 09:34:11 -07:00
src	Merge pull request #10135 from samcake/ambient	2017-04-07 09:54:10 -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