aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-28 17:23:58 +0800
committerobscuren <geffobscura@gmail.com>2015-01-28 17:23:58 +0800
commit159c4d56cd82d6fe721058557977f4efda31661c (patch)
tree312b5a6ed0a24e884328b7ea90778164eda8a70e /.gitignore
parent7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c (diff)
parent8c99a87aa842e8b6cf44281dad1ca10371f109dd (diff)
downloadgo-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.tar
go-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.tar.gz
go-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.tar.bz2
go-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.tar.lz
go-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.tar.xz
go-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.tar.zst
go-tangerine-159c4d56cd82d6fe721058557977f4efda31661c.zip
Merge branch 'develop' into jsonrpc
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f84fe6040..71ce90db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
.#*
*#
*~
+.project
+.settings