Merge pull request #1

f1eaf88 Prints seed after wallet upgrade. Removed iostream include. (Oran Juice)
70971be Doxygen comments (Oran Juice)
031ca23 Rewrites to old wallet file correctly (Oran Juice)
1f833dc Doxygen comments in (Oran Juice)
0bd88ff Writes seed language while generating wallet. Wallet open fix. (Oran Juice)
09a659e Stores seed language in wallet file. added rapidjson. Yet to test backward compatibility (Oran Juice)
This commit is contained in:
Riccardo Spagni
2014-12-01 20:14:58 +02:00
29 changed files with 8196 additions and 30 deletions

View File

@@ -83,6 +83,7 @@ endif()
# set(BSDI TRUE)
include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/version")
include_directories(src/common)
if(APPLE)
include_directories(SYSTEM /usr/include/malloc)