Merge branch 'master' into travis_cleanup

[skip lint] [skip appveyor]
conda-forge · Jan 22, 2017 · 617025f · 617025f
2 parents 62706f3 + c482dc1
commit 617025f
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 434 deletions.
diff --git a/recipes/gmt/build.sh b/recipes/gmt/build.sh
diff --git a/recipes/gmt/meta.yaml b/recipes/gmt/meta.yaml
diff --git a/recipes/gobject-introspection/build.sh b/recipes/gobject-introspection/build.sh
diff --git a/recipes/gobject-introspection/hugepaths.patch b/recipes/gobject-introspection/hugepaths.patch
diff --git a/recipes/gobject-introspection/meta.yaml b/recipes/gobject-introspection/meta.yaml
diff --git a/recipes/rapidjson/bld.bat b/recipes/rapidjson/bld.bat
diff --git a/recipes/rapidjson/build.sh b/recipes/rapidjson/build.sh
diff --git a/recipes/rapidjson/meta.yaml b/recipes/rapidjson/meta.yaml
diff --git a/recipes/wrf-python/bld.bat b/recipes/wrf-python/bld.bat
diff --git a/recipes/wrf-python/build.sh b/recipes/wrf-python/build.sh