Merge remote-tracking branch 'origin/vtexier_fixes' into dev081 (fb3fb282) · Commits · clients / python / sakia · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

sakia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

fb3fb282

Commit fb3fb282 authored 10 years ago by inso

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/vtexier_fixes' into dev081

Conflicts:
	src/cutecoin/gui/currency_tab.py
	src/cutecoin/models/txhistory.py

parents a1f7d444 950489cf

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

res/ui/informations_tab.ui 10 additions, 10 deletions

res/ui/informations_tab.ui
src/cutecoin/core/transfer.py 0 additions, 4 deletions

src/cutecoin/core/transfer.py
src/cutecoin/gui/currency_tab.py 21 additions, 15 deletions

src/cutecoin/gui/currency_tab.py
src/cutecoin/gui/informations_tab.py 34 additions, 32 deletions

src/cutecoin/gui/informations_tab.py
src/cutecoin/gui/mainwindow.py 2 additions, 2 deletions

src/cutecoin/gui/mainwindow.py
src/cutecoin/models/txhistory.py 40 additions, 10 deletions

src/cutecoin/models/txhistory.py

with 107 additions and 73 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment