diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:48 +0800 |
| commit | 7336dfad02833989037440fb22e01566444d0100 (patch) | |
| tree | 8f7dc62676e519236b69a977c7af00d81b1e0406 /.gitignore | |
| parent | c9985bf563888d5f346408d2ff174167e8b65880 (diff) | |
| parent | 00fca409398172811e71158e0ca9f6229e0f815b (diff) | |
| download | dexon-7336dfad02833989037440fb22e01566444d0100.tar dexon-7336dfad02833989037440fb22e01566444d0100.tar.gz dexon-7336dfad02833989037440fb22e01566444d0100.tar.bz2 dexon-7336dfad02833989037440fb22e01566444d0100.tar.lz dexon-7336dfad02833989037440fb22e01566444d0100.tar.xz dexon-7336dfad02833989037440fb22e01566444d0100.tar.zst dexon-7336dfad02833989037440fb22e01566444d0100.zip | |
Merge branch 'develop' into poc8
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fea7df6c2..71ce90db3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,10 @@ .DS_Store */**/.DS_Store .ethtest + +#* +.#* +*# +*~ +.project +.settings |