Merging Messagestarring branch with the up to date version

This commit is contained in:
Arnukk 2014-03-17 23:14:24 +04:00
parent dbeb653ba1
commit 7c5ed36e1e

View File

@ -16,7 +16,7 @@ except ImportError:
from addresses import * from addresses import *
import shared import shared
from bitmessageui import * from bitmessageui import *
#from namecoin import namecoinConnection, ensureNamecoinOptions from namecoin import namecoinConnection, ensureNamecoinOptions
from newaddressdialog import * from newaddressdialog import *
from addaddressdialog import * from addaddressdialog import *
from newsubscriptiondialog import * from newsubscriptiondialog import *