Jonathan Warren
|
4c920fd153
|
resolve merge conflict
|
2013-08-25 15:56:20 -04:00 |
|
Jordan Hall
|
53ca5b03ff
|
Changing text for API Error 0007 log warning (cont.)
|
2013-08-10 23:13:15 +01:00 |
|
Jordan Hall
|
2c09326c37
|
Changing text for API Error 0007 log warning
|
2013-08-10 23:10:21 +01:00 |
|
Jordan Hall
|
326e294932
|
Reverted back to importing only logger instead of all of shared
|
2013-08-09 23:32:49 +01:00 |
|
Jordan Hall
|
a69a00d186
|
Improved logger function calls and import shared here instead of debug
|
2013-08-09 23:26:16 +01:00 |
|
Jordan Hall
|
13196233a9
|
Merge with upstream and fixed conflicts
|
2013-08-07 21:40:01 +01:00 |
|
Jordan Hall
|
ab4d53593b
|
Fix to python version critical log message
|
2013-08-07 21:34:46 +01:00 |
|
Jordan Hall
|
b529280160
|
Further fixes
|
2013-08-07 21:22:23 +01:00 |
|
Jordan Hall
|
26b82984a2
|
Fixes to logger function calls
|
2013-08-07 21:12:32 +01:00 |
|
Jordan Hall
|
0f357529ed
|
bitmessagemain, changing prints tologger functions
|
2013-08-06 22:28:21 +01:00 |
|