UbitUmarov 24472c3b67 fix merge issues

2015-11-01 03:25:36 +00:00

..

Agent

revert validating Library textures. Those need to be on a grid assets or will not work anyway

2015-09-12 12:51:47 +01:00

Asset

bad merge?

2015-09-01 14:54:35 +01:00

Avatar

Merge branch 'master' into avinationmerge

2015-11-01 03:01:59 +00:00

Framework

fix merge issues

2015-11-01 03:25:36 +00:00

Hypergrid

bad merge?

2015-09-01 14:54:35 +01:00

Properties

On to 0.8.3!

2015-10-18 21:51:49 -07:00

Scripting

merge issue: fix missing '/'

2015-10-24 22:48:31 +01:00

ServiceConnectorsIn

add missing handlers for preferences

2015-09-28 13:22:32 +01:00

ServiceConnectorsOut

Merge branch 'master' into avinationmerge

2015-11-01 03:01:59 +00:00

World

Merge branch 'master' into avinationmerge

2015-11-01 03:01:59 +00:00