63f60b1777
Merge pull request #133 from fluffypony/master
...
fixed cmake variable matching
2014-09-12 13:30:14 +02:00
570b90eb43
fixed cmake variable matching
2014-09-12 13:27:30 +02:00
e7c52d94c0
Merge pull request #132 from fluffypony/master
...
versioning now includes the commit hash, or -final for tagged releases
2014-09-12 13:18:12 +02:00
aab57ba9cc
Merge branch 'master' of http://github.com/fluffypony/bitmonero
...
Conflicts:
src/daemon/daemon.cpp
2014-09-12 13:16:29 +02:00
8334ce0b24
versioning now includes the commit hash, or -final for tagged releases
2014-09-12 13:12:43 +02:00
446a7ddc49
always check git diff
2014-09-12 13:12:43 +02:00
ffaa78700c
Merge pull request #129 from Jebes/master
...
Added documentation to varint.h and util.h
2014-09-12 13:12:07 +02:00
14b3b6ea02
versioning now includes the commit hash, or -final for tagged releases
2014-09-12 13:06:51 +02:00
dd51b03d87
always check git diff
2014-09-12 00:40:25 +02:00
a13e879251
HOW DO I ENGLISH?
2014-09-11 10:45:05 -04:00
f7900ccfc1
mispelled brief, corrected it
2014-09-11 10:36:39 -04:00
dfed3d39b6
Merge remote-tracking branch 'upstream/master'
2014-09-11 10:20:55 -04:00
9d6f9335d1
HOW DO I GIT?
2014-09-11 10:20:17 -04:00
a70bf86037
Documented varint
2014-09-11 10:14:05 -04:00
8779a6da39
Merge pull request #128 from fluffypony/master
...
fixed UPNP_LIBRARIES scope
2014-09-11 13:30:24 +02:00
b35c1e2491
fixed UPNP_LIBRARIES scope
2014-09-11 13:28:49 +02:00
6a70de32bf
Merge pull request #127 from fluffypony/master
...
FreeBSD compatibility and default log level changes
2014-09-11 12:00:30 +02:00
a40d5c1847
cpu affinity fixes in performance tests for FreeBSD
2014-09-11 11:42:59 +02:00
afc61dda45
gtest patches for FreeBSD
2014-09-11 10:02:24 +02:00
3217ed39ae
fixed upnp libs in tests cmake
2014-09-11 08:28:28 +02:00
d21cf293e1
added license to CMake
2014-09-11 08:25:07 +02:00
36c7ea9f77
more CMake tweaks to allow detection on OS X
2014-09-11 08:22:49 +02:00
8d8b47e69f
more dynamic miniupnp fixes
2014-09-10 20:01:30 +02:00
59c0423eae
miniupnpc includes fixed
2014-09-10 18:22:20 +02:00
7d01dad8f4
use external miniupnpc if available
2014-09-10 18:14:57 +02:00
81490d2aea
miniupnpc changes for freebsd
2014-09-10 14:19:42 +02:00
ccb2ab2b7b
mmap on FreeBSD doesn't have MAP_HUGETLB
2014-09-10 14:01:39 +02:00
110f110181
Include sys/time.h on BSD
2014-09-10 13:58:43 +02:00
a8d043b6dd
replace ftime with gettimeofday on FreeBSD because lcompat is stupid
2014-09-10 13:55:39 +02:00
0e343ecfdf
make FreeBSD use -lcompat till we can fix ftime()
2014-09-10 13:25:34 +02:00
c085e9294f
commented util.h
2014-09-09 20:18:23 -04:00
266c639f4f
more FreeBSD fixes
2014-09-09 14:49:13 +02:00
e1d31e0a8b
malloc.h reference fixed for FreeBSD
2014-09-09 14:07:57 +02:00
5a65991480
exclude local miniupnpc for FreeBSD, install from ports instead
2014-09-09 14:03:42 +02:00
6afbdd9754
FreeBSD alloca.h reference fixed
2014-09-09 12:37:19 +02:00
4ba680f294
a few more error messages moved to log level 1
2014-09-09 12:28:16 +02:00
cf5a8b1d6c
moved non-critical warnings and errors to log level 1
2014-09-09 11:32:00 +02:00
bf972c40fc
Merge pull request #123 from fluffypony/master
...
build number increase after release
2014-09-07 08:38:54 +02:00
4290c78160
build number increase after release
2014-09-07 08:33:41 +02:00
3c2b74215b
Merge pull request #121 from fluffypony/master
...
Fix tree_hash, patch for bad block 202612
2014-09-06 21:57:37 +02:00
0a9f2f5236
fix checkpoints
2014-09-06 21:56:39 +02:00
07680e553f
bug fix to checkpoint-on-restore; still fails on 612
2014-09-06 21:56:34 +02:00
480cf9668f
checkpoints on restore; currently fails on 212 checkpoint
2014-09-06 21:56:29 +02:00
2ef0aee81d
Fix tree-hash cnt n^2. Asserts, comment. Squash2
2014-09-06 21:56:24 +02:00
c05489938f
override for get_block_longhash for block 202612
2014-09-06 21:56:18 +02:00
9a16bb9936
added double-check for 202612 block id
...
if a new block has the same block id as 202612 but the wrong blobdata,
this will tell the caller that the block id is actually null_hash rather
than the 202612 block id.
2014-09-06 21:56:12 +02:00
115f9523fa
hex_to_pod needs the destination as an arg, as opposed to it returning the pod
2014-09-06 21:56:06 +02:00
a544603a7b
Override for block hashing for block 202612
...
Since we need to fix tree_hash, but doing so would invalidate the block
id for block 202612, this fix should check to see if we're trying to get
the block id for 202612 (if its blob hash matches) and return the "old"
block id, for backwards compatibility.
2014-09-06 21:54:58 +02:00
1d6372cccf
Merge pull request #112 from fluffypony/master
...
fixed OS X malloc.h reference
2014-09-02 12:20:15 +02:00
f8025cada9
fixed OS X malloc.h reference
2014-09-02 12:08:27 +02:00
Riccardo Spagni