 Luke Dashjr
|
77558d005e
Merge commit 'c4a8f47' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
08a6be6717
Merge commit '2645797' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
c067ddb7a6
Merge commit '832012f' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
51adcd2874
Merge commit 'a7cbbc9' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
ec01f46d14
Merge commit '0676a1a' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
186e636bd9
Merge commit '43bcccf' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
2318d14b3b
Merge commit '891f88b' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
6ab2906d4b
Merge commit 'e999caa' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
9610c8579c
Semi-Merge commit 'd2abaa8' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
848d774006
Merge commit '3cc4223' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
b8c896eed2
Merge commit '3d7f824' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
677d2b4dcd
Merge commit '3b5ef34' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
c66b2c721b
Merge commit '81549c5' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
6d3a6b5165
Merge commit 'd248e7a' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
eadb8d967d
Merge commit 'ae4ee34' into update_avalon_20130524
|
12 years ago |
|
Luke Dashjr
|
19294f1238
Merge branch 'winpthread' into cg_merges_20130523a
|
12 years ago |
|
Luke Dashjr
|
9fb8b34e4e
Use has_pth flag instead of trying to mess with pthread internals
|
12 years ago |
|
Luke Dashjr
|
d4bacef58c
Merge commit 'b6e3d5b' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
392996480a
Merge commit '1a74bc5' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
613ecb407e
Merge commit '26ddd1f' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
3ea2ce3f28
Merge commit 'e0196a3' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
25820e236d
Semi-Merge commit '56068d6' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
b5df3ae7cc
Merge commit '9b34d82' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
5b4851851d
Merge commit '09c02b1' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
a6331eb5f1
Merge commit '501f4cd' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
0e52d3c09c
Merge commit '07ae617' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
f7654752ab
Semi-Merge commit 'e315179' into cg_merges_20130513 (just rearrange var def)
|
12 years ago |
 mhren
|
c5bfc45233
Update util.c
|
12 years ago |
 Con Kolivas
|
3972fe223b
Show a different warning and loglevel for failure to resolve a URL on first or subsequent testing of stratum pool URLs.
|
12 years ago |
|
Con Kolivas
|
2645797fca
Set all stratum sockets to nonblocking to avoid trying to use MSG_DONTWAIT on windows.
|
12 years ago |
