Merge branch 'master' into prefs

This commit is contained in:
blitzmann
2014-03-02 23:55:46 -05:00
10 changed files with 382 additions and 15 deletions

View File

@@ -1 +1 @@
__all__ = ["pyfaGlobalPreferences","pyfaHTMLExportPreferences","pyfaProxyPreferences"]
__all__ = ["pyfaGlobalPreferences","pyfaHTMLExportPreferences","pyfaUpdatePreferences","pyfaProxyPreferences"]