Merged updates from upstream

2016-05-05 15:32:31 -07:00
parent 332750c2e4 bdca3e3b48
commit b5c577fcdf
16 changed files with 332 additions and 12 deletions
@@ -1,3 +1,8 @@
 deploy/*
 work/*
 .vscode/*
+
+config
+SKIP
+.pc
+*-pc