Merge 2d1e57d into ade6153

hyperspy · Aug 29, 2018 · d8d1f21 · d8d1f21
2 parents ade6153 + 2d1e57d
commit d8d1f21
Show file tree

Hide file tree

Showing 45 changed files with 28 additions and 2,843 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ data/octave-core
 .spyderproject
 doc/_build/*
 doc/.build/*
+doc/api/*
 doc/user_guide/_build/*
 doc/user_guide/.build/*
 setup/windows/requires/*
@@ -42,3 +43,10 @@ hyperspy/io_plugins/unbcf_fast.c
 hyperspy/misc/etc/test_compilers.obj
 /.cache/
 /.spyproject/
+
+### Code ###
+# Visual Studio Code - https://code.visualstudio.com/
+.settings/
+.vscode/
+tsconfig.json
+jsconfig.json
diff --git a/doc/api/hyperspy._components.rst b/doc/api/hyperspy._components.rst
diff --git a/doc/api/hyperspy._signals.rst b/doc/api/hyperspy._signals.rst
diff --git a/doc/api/hyperspy.datasets.rst b/doc/api/hyperspy.datasets.rst