summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authortxh18 <[email protected]>2015-10-28 19:13:48 +0800
committertxh18 <[email protected]>2015-10-28 19:13:48 +0800
commit7e1c4e9f8b39e160814827befe02832737095a7d (patch)
tree231900fc18bfd40946e342fa29ecc7b02bc9bb37 /.gitignore
parente828c358b2637eac603f519b981737977ef4cb64 (diff)
parenta59b0b3df1bbd80f7c31e58fc70698f218117e67 (diff)
get recent changes
Merge branch 'master' of github.com:Nerv-SJTU/nerv
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5c87b71..d075d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ install/
build/
*.swp
*.swo
+speech/