Public Git Hosting - Torque-3d.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 598756f 170cdad)

commit	713c93d328609c7f95bbcd9c9c053213d3d4a948
author	Areloch <Areloch@gmail.com>
	Mon, 16 Jan 2017 05:37:06 +0000 (15 23:37 -0600)
committer	Areloch <Areloch@gmail.com>
	Mon, 16 Jan 2017 05:37:06 +0000 (15 23:37 -0600)
tree	39f9fdc9ae6f754923261554f8fc0fb4b1a774f8	tree \| snapshot (tar.gz zip)
parent	598756f134df19b743ef09834e66bd3ce693543d	commit \| diff
parent	170cdadf6000a55f2f3f4fab6bb0fcd659aaa599	commit \| diff

Merge branch 'splashAndWindowIcons' of https://github.com/Areloch/Torque3D into development