PyBitmessage/src/bitmessageqt
Daniel Kraft a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
2013-07-17 18:15:45 +02:00
..
__init__.py Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-17 18:15:45 +02:00
about.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
about.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
addpeer.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
bitmessage_icons.qrc Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move 2013-07-13 20:35:06 -04:00
bitmessage_icons_rc.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
bitmessageui.py Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-17 18:15:45 +02:00
bitmessageui.ui Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-17 18:15:45 +02:00
help.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
help.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
iconglossary.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
iconglossary.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
newaddressdialog.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
newaddressdialog.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
newchandialog.py added newchandialog.py 2013-06-25 17:14:44 -04:00
newchandialog.ui added newchandialog.py 2013-06-25 17:14:44 -04:00
newsubscriptiondialog.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
newsubscriptiondialog.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
regenerateaddresses.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
regenerateaddresses.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
settings.py Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-17 18:15:45 +02:00
settings.ui Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-17 18:15:45 +02:00
specialaddressbehavior.py Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
specialaddressbehavior.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
wanlan.ui Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00