Manually merge branch 'master' into brttnext

antelopeusersgroup · Jun 12, 2015 · 4a09093 · 4a09093
2 parents a831f2c + 57d1346
commit 4a09093
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/data/python/Makefile b/data/python/Makefile
@@ -0,0 +1,2 @@
+SUBDIR=/contrib
+include $(ANTELOPEMAKE)