Merge branch 'dev'
Conflicts: Makefile README.md
No related branches found
No related tags found
Showing
- .gitmodules 3 additions, 0 deletions.gitmodules
- Makefile 1 addition, 1 deletionMakefile
- README.md 1 addition, 0 deletionsREADME.md
- lib/ucoinpy 1 addition, 0 deletionslib/ucoinpy
- res/ui/accountConfigurationDialog.ui 49 additions, 11 deletionsres/ui/accountConfigurationDialog.ui
- res/ui/addContactDialog.ui 145 additions, 0 deletionsres/ui/addContactDialog.ui
- res/ui/communityConfigurationDialog.ui 29 additions, 8 deletionsres/ui/communityConfigurationDialog.ui
- res/ui/communityParametersWidget.ui 91 additions, 0 deletionsres/ui/communityParametersWidget.ui
- res/ui/mainwindow.ui 69 additions, 4 deletionsres/ui/mainwindow.ui
- setup.py 47 additions, 0 deletionssetup.py
- src/cutecoin/core/__init__.py 2 additions, 2 deletionssrc/cutecoin/core/__init__.py
- src/cutecoin/gen_resources/__init__.py 5 additions, 0 deletionssrc/cutecoin/gen_resources/__init__.py
- src/cutecoin/gui/__init__.py 5 additions, 0 deletionssrc/cutecoin/gui/__init__.py
- src/cutecoin/gui/addAccountDialog.py 0 additions, 60 deletionssrc/cutecoin/gui/addAccountDialog.py
- src/cutecoin/gui/addCommunityDialog.py 0 additions, 44 deletionssrc/cutecoin/gui/addCommunityDialog.py
- src/cutecoin/gui/addContactDialog.py 43 additions, 0 deletionssrc/cutecoin/gui/addContactDialog.py
- src/cutecoin/gui/configureAccountDialog.py 100 additions, 0 deletionssrc/cutecoin/gui/configureAccountDialog.py
- src/cutecoin/gui/configureCommunityDialog.py 74 additions, 0 deletionssrc/cutecoin/gui/configureCommunityDialog.py
- src/cutecoin/gui/mainWindow.py 29 additions, 18 deletionssrc/cutecoin/gui/mainWindow.py
- src/cutecoin/gui/transferMoneyDialog.py 9 additions, 4 deletionssrc/cutecoin/gui/transferMoneyDialog.py
Loading
Please register or sign in to comment