Merge remote-tracking branch 'origin/1.0.5' into development

This commit is contained in:
larsbrubaker 2014-03-28 20:39:12 -07:00
commit c146a1cf26

1
.gitignore vendored
View file

@ -106,3 +106,4 @@ Generated_Code #added for RIA/Silverlight projects
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
MatterControl.userprefs