Merge branch 'icon_devel'
author Andy
()
committer Andy
()
commit d9dc6b1fc64d140e2150e405de0ac973019b4ca2
tree 9f733d2c45b7143752962e0ea01ddabe09c2dcdc
parent 3e99b1fada21a37f752856fb8d7112406355935f
parent 25a170bf1f052816c73eddcd50d8c11850eed2b7
Merge branch 'icon_devel'

Conflicts:
VOID_Core.cs
VOID_Core.cs