merge of casinocoin_1.3.0-uat into master

This commit is contained in:
Salvatore Giudice
2014-07-17 23:36:12 -07:00
parent 04474f996d
commit 213e373b64

3
.gitignore vendored
View File

@@ -8,7 +8,6 @@ src/test_casinocoin
*.rej *.rej
*.orig *.orig
*.o *.o
*.patch
.casinocoin .casinocoin
# Compilation and Qt preprocessor part # Compilation and Qt preprocessor part
@@ -31,4 +30,4 @@ qrc_*.cpp
.DS_Store .DS_Store
build build
!src/leveldb/Makefile !src/leveldb/Makefile