Stephen Birarda 340248ac43 resolve conflicts on merge with upstream master		2014-02-21 15:16:15 -08:00
..
config	Add import configuration	2014-01-10 23:26:58 +01:00
html	popup layot	2013-09-09 23:27:03 +02:00
icons	Added icons for import dialog buttons	2014-02-19 12:33:05 -08:00
images	Removed unused resources.	2014-01-16 15:16:19 -08:00
info	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
meshes	Switched from loading FBX and FST simultaneously to loading FST first, then	2014-02-11 14:20:52 -08:00
shaders	fix voxel texture to work better with larger TREE_SCALE	2014-02-12 18:00:09 -08:00
sounds	filename format changes	2014-01-27 20:35:06 +01:00
styles	Changed Import button size	2014-02-20 10:37:31 -08:00