Joshua Barretto b72c6b7185 Merge branch 'master' into 'master' ... bag visuals fix See merge request veloren/veloren!75 Former-commit-id: 30b26e73c0d43ef4f0c3d55154547e5d010a33a7		2019-04-25 21:59:55 +00:00
..
shaders	add ui text rendering	2019-03-20 01:24:21 -04:00
src	Merge branch 'master' into 'master'	2019-04-25 21:59:55 +00:00
test_assets	adding test assets	2019-04-20 19:13:38 -04:00
.gitignore	Added user-friendly error output for Voxygen	2019-04-25 13:08:46 +01:00
Cargo.toml	Use the directory defined by the OS to store configuration files	2019-04-25 10:24:00 -06:00