Merge remote-tracking branch 'origin/toolbarwrapper_static_factory'
author Andy
()
committer Andy
()
commit 39e39bc27a709d3fd5e6b291ca9fe93f283812ff
tree fe30a6191a4d709ebb482ce49b2767a0210424f7
parent 2b0e1ad43e76133f5d25391096d1d435cae7dc54
parent 2524d2dc1f61e8b59b4fc96ad62ff860b4002f1c
Merge remote-tracking branch 'origin/toolbarwrapper_static_factory'

Conflicts:
ToolbarButtonWrapper.cs
ToolbarButtonWrapper.cs
VOID_Core.cs