diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-28 17:29:29 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-28 17:29:29 +0800 |
| commit | 4c5968097d2a9fef8af904bfee93cd76cdafd314 (patch) | |
| tree | f896c42c37eddfd2f912115eab3dd9f59eaa484d /.gitignore | |
| parent | f3e78c8f3cd2196ef70a41f298b6df556543d581 (diff) | |
| parent | 159c4d56cd82d6fe721058557977f4efda31661c (diff) | |
| download | dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.tar dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.tar.gz dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.tar.bz2 dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.tar.lz dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.tar.xz dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.tar.zst dexon-4c5968097d2a9fef8af904bfee93cd76cdafd314.zip | |
Merge branch 'jsonrpc' into qt5.4
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
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 |