PyBitmessage/src
Peter Šurda aabf600c38
Fix incorrectly resolved merge conflicts
Two file merge conflicts, __init__.py and upnp.py, were not resolved
correctly by the automatic resolving (probably because the affected code
was written by other people and I merged them into mailchuck fork). This
changes it to the same code that is in the mailchuck fork)
2016-05-02 17:10:45 +02:00
..
bitmessagecurses forgot a question mark character in a sql query 2015-03-09 02:42:28 -04:00
bitmessageqt Fix incorrectly resolved merge conflicts 2016-05-02 17:10:45 +02:00
bitmsghash OpenCL kernel change 2016-05-02 15:00:21 +02:00
images removed images/can-icon-24px_2.png 2013-11-01 19:28:44 -04:00
pyelliptic Typo 2016-05-02 15:00:23 +02:00
socks DNS bootstrap over Tor 2016-05-02 15:00:21 +02:00
sslkeys Opportunistic encryption with TLS (2 of 2) 2016-05-02 15:00:20 +02:00
translations Translations update 2016-05-02 16:07:58 +02:00
addresses.py Some preparations for python 3 2016-05-02 15:00:25 +02:00
api.py Copyright year updates 2016-05-02 15:00:26 +02:00
api_client.py more v4 address work. Should be done. 2013-09-18 00:04:01 -04:00
bitmessagecli.py Minor changes in cli, PoW, and a couple of new api calls. 2016-05-02 15:00:17 +02:00
bitmessagemain.py Copyright year updates 2016-05-02 15:00:26 +02:00
build_osx.py Update build scripts 2016-05-02 15:00:25 +02:00
class_addressGenerator.py Translation update 2016-05-02 15:00:26 +02:00
class_objectHashHolder.py GUI shutdown improvements 2016-05-02 15:00:25 +02:00
class_objectProcessor.py Translation update 2016-05-02 15:00:26 +02:00
class_objectProcessorQueue.py objectProcessorQueue fixes 2016-05-02 15:00:23 +02:00
class_outgoingSynSender.py Translation update 2016-05-02 15:00:26 +02:00
class_receiveDataThread.py Some preparations for python 3 2016-05-02 15:00:25 +02:00
class_sendDataThread.py Thread names for IPv6 2016-05-02 15:00:23 +02:00
class_singleCleaner.py Translation update 2016-05-02 15:00:26 +02:00
class_singleListener.py Sleep on invalid getdata 2016-05-02 15:00:24 +02:00
class_singleWorker.py Translation update 2016-05-02 15:00:26 +02:00
class_sqlThread.py Translation update 2016-05-02 15:00:26 +02:00
debug.py Remove default debugging 2016-05-02 15:00:26 +02:00
defaultKnownNodes.py update list of defaultKnownNodes 2015-03-09 22:33:46 -04:00
depends.py DLL path fix in frozen mode 2016-05-02 15:00:23 +02:00
helper_bitcoin.py Fixed missing arithmetic import in helper_bitcoin file 2013-06-21 12:58:36 +01:00
helper_bootstrap.py Allow bootstrap from a Tor hidden service 2016-05-02 15:00:22 +02:00
helper_generic.py Some preparations for python 3 2016-05-02 15:00:25 +02:00
helper_inbox.py Update unread count more efficiently 2016-05-02 15:00:19 +02:00
helper_search.py Sent folder in chans extended 2016-05-02 15:00:24 +02:00
helper_sent.py finished work on specifyTTL 2015-03-09 02:35:32 -04:00
helper_sql.py sqlExecute now returns rowcount 2016-05-02 15:00:24 +02:00
helper_startup.py Typos 2016-05-02 15:00:22 +02:00
helper_threading.py Threads close better 2016-05-02 15:00:21 +02:00
highlevelcrypto.py Some preparations for python 3 2016-05-02 15:00:25 +02:00
l10n.py Windows locale fix 2016-05-02 15:00:26 +02:00
message_data_reader.py Some preparations for python 3 2016-05-02 15:00:25 +02:00
namecoin.py Translation update 2016-05-02 15:00:26 +02:00
openclpow.py PoW can sometimes be shutdown-able 2016-05-02 15:00:25 +02:00
proofofwork.py Translation update 2016-05-02 15:00:26 +02:00
protocol.py Addresses can be configured not to send acks 2016-05-02 15:00:22 +02:00
qidenticon.py nonfunctional identicon settings-GUI 2013-09-18 17:39:45 +02:00
shared.py GUI shutdown improvements 2016-05-02 15:00:25 +02:00
singleton.py Cleanup lockfile on exit 2016-05-02 15:00:23 +02:00
tr.py Typo 2016-05-02 15:00:26 +02:00
upnp.py Fix incorrectly resolved merge conflicts 2016-05-02 17:10:45 +02:00