JoeG a96c5986c5 Merge remote-tracking branch 'upstream/develop' into develop ...

Conflicts:
	Mist/assets/qml/wallet.qml

2014-09-18 21:41:45 +01:00

..

assets

Merge remote-tracking branch 'upstream/develop' into develop

2014-09-18 21:41:45 +01:00

bindings.go

Renamed ethereal

2014-09-17 15:58:26 +02:00

debugger.go

Renamed ethereal

2014-09-17 15:58:26 +02:00

errors.go

Renamed ethereal

2014-09-17 15:58:26 +02:00

ext_app.go

Renamed ethereal

2014-09-17 15:58:26 +02:00

flags.go

Rename and changed peer window

2014-09-17 15:58:44 +02:00

gui.go

Rename and changed peer window

2014-09-17 15:58:44 +02:00

html_container.go

Renamed ethereal

2014-09-17 15:58:26 +02:00

main.go

Rename and changed peer window

2014-09-17 15:58:44 +02:00

qml_container.go

Renamed ethereal

2014-09-17 15:58:26 +02:00

ui_lib.go

Rename and changed peer window

2014-09-17 15:58:44 +02:00