JoeG a96c5986c5 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: Mist/assets/qml/wallet.qml		2014-09-18 21:41:45 +01:00
..
views	Minor visual updates	2014-09-18 11:27:55 +02:00
first_run.qml	Renamed ethereal	2014-09-17 15:58:26 +02:00
muted.qml	Renamed ethereal	2014-09-17 15:58:26 +02:00
QmlApp.qml	Renamed ethereal	2014-09-17 15:58:26 +02:00
test_app.qml	Renamed ethereal	2014-09-17 15:58:26 +02:00
transactions.qml	Renamed ethereal	2014-09-17 15:58:26 +02:00
wallet.qml	Merge remote-tracking branch 'upstream/develop' into develop	2014-09-18 21:41:45 +01:00
webapp.qml	Renamed ethereal	2014-09-17 15:58:26 +02:00