Riccardo Spagni
f2937d15bd
Merge branch 'master' of http://github.com/fluffypony/bitmonero
2014-09-15 08:18:34 +02:00
Riccardo Spagni
d97191d4f9
new Makefile target: release-static
2014-09-15 08:18:11 +02:00
Riccardo Spagni
8afbed4027
new Makefile target: release-static
2014-09-15 08:13:26 +02:00
Riccardo Spagni
5a3ce8a7dc
FreeBSD static linking fixes
2014-09-15 08:08:03 +02:00
Riccardo Spagni
566d194c41
Merge branch 'master' of http://github.com/fluffypony/bitmonero
2014-09-14 14:13:09 +02:00
Riccardo Spagni
9e2ac5308a
add gpg pubkeys to start enforcing signed commits
2014-09-14 14:12:53 +02:00
Riccardo Spagni
9c56b38b16
Merge pull request #136
...
bb2b606
fix incorrect error message (obvious cut and paste bug from upstream) (iamsmooth)
6b77e83
Change wallet to not try to extract tx public key when tx has no outputs (fixes 202612 tx format messages and is otherwise correct) (iamsmooth)
08205f0
output rng fix from boolberry (iamsmooth)
2014-09-13 10:24:39 +02:00
iamsmooth
bb2b606e91
fix incorrect error message (obvious cut and paste bug from upstream)
2014-09-13 08:04:05 +00:00
Riccardo Spagni
12c1b0922a
add gpg pubkeys to start enforcing signed commits
2014-09-13 10:03:31 +02:00
iamsmooth
6b77e8358c
Change wallet to not try to extract tx public key when tx has no outputs (fixes 202612 tx format messages and is otherwise correct)
2014-09-13 04:25:33 +00:00
iamsmooth
08205f01d9
output rng fix from boolberry
2014-09-12 22:57:32 +00:00
Riccardo Spagni
63f60b1777
Merge pull request #133 from fluffypony/master
...
fixed cmake variable matching
2014-09-12 13:30:14 +02:00
Riccardo Spagni
570b90eb43
fixed cmake variable matching
2014-09-12 13:27:30 +02:00
Riccardo Spagni
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
Riccardo Spagni
aab57ba9cc
Merge branch 'master' of http://github.com/fluffypony/bitmonero
...
Conflicts:
src/daemon/daemon.cpp
2014-09-12 13:16:29 +02:00
Riccardo Spagni
8334ce0b24
versioning now includes the commit hash, or -final for tagged releases
2014-09-12 13:12:43 +02:00
Riccardo Spagni
446a7ddc49
always check git diff
2014-09-12 13:12:43 +02:00
Riccardo Spagni
ffaa78700c
Merge pull request #129 from Jebes/master
...
Added documentation to varint.h and util.h
2014-09-12 13:12:07 +02:00
Riccardo Spagni
14b3b6ea02
versioning now includes the commit hash, or -final for tagged releases
2014-09-12 13:06:51 +02:00
Riccardo Spagni
dd51b03d87
always check git diff
2014-09-12 00:40:25 +02:00
jebes
a13e879251
HOW DO I ENGLISH?
2014-09-11 10:45:05 -04:00
jebes
f7900ccfc1
mispelled brief, corrected it
2014-09-11 10:36:39 -04:00
jebes
dfed3d39b6
Merge remote-tracking branch 'upstream/master'
2014-09-11 10:20:55 -04:00
jebes
9d6f9335d1
HOW DO I GIT?
2014-09-11 10:20:17 -04:00
jebes
a70bf86037
Documented varint
2014-09-11 10:14:05 -04:00
Riccardo Spagni
8779a6da39
Merge pull request #128 from fluffypony/master
...
fixed UPNP_LIBRARIES scope
2014-09-11 13:30:24 +02:00
fluffypony
b35c1e2491
fixed UPNP_LIBRARIES scope
2014-09-11 13:28:49 +02:00
Riccardo Spagni
6a70de32bf
Merge pull request #127 from fluffypony/master
...
FreeBSD compatibility and default log level changes
2014-09-11 12:00:30 +02:00
fluffypony
a40d5c1847
cpu affinity fixes in performance tests for FreeBSD
2014-09-11 11:42:59 +02:00
fluffypony
afc61dda45
gtest patches for FreeBSD
2014-09-11 10:02:24 +02:00
fluffypony
3217ed39ae
fixed upnp libs in tests cmake
2014-09-11 08:28:28 +02:00
fluffypony
d21cf293e1
added license to CMake
2014-09-11 08:25:07 +02:00
fluffypony
36c7ea9f77
more CMake tweaks to allow detection on OS X
2014-09-11 08:22:49 +02:00
fluffypony
8d8b47e69f
more dynamic miniupnp fixes
2014-09-10 20:01:30 +02:00
fluffypony
59c0423eae
miniupnpc includes fixed
2014-09-10 18:22:20 +02:00
fluffypony
7d01dad8f4
use external miniupnpc if available
2014-09-10 18:14:57 +02:00
fluffypony
81490d2aea
miniupnpc changes for freebsd
2014-09-10 14:19:42 +02:00
fluffypony
ccb2ab2b7b
mmap on FreeBSD doesn't have MAP_HUGETLB
2014-09-10 14:01:39 +02:00
fluffypony
110f110181
Include sys/time.h on BSD
2014-09-10 13:58:43 +02:00
fluffypony
a8d043b6dd
replace ftime with gettimeofday on FreeBSD because lcompat is stupid
2014-09-10 13:55:39 +02:00
fluffypony
0e343ecfdf
make FreeBSD use -lcompat till we can fix ftime()
2014-09-10 13:25:34 +02:00
jebes
c085e9294f
commented util.h
2014-09-09 20:18:23 -04:00
fluffypony
266c639f4f
more FreeBSD fixes
2014-09-09 14:49:13 +02:00
fluffypony
e1d31e0a8b
malloc.h reference fixed for FreeBSD
2014-09-09 14:07:57 +02:00
fluffypony
5a65991480
exclude local miniupnpc for FreeBSD, install from ports instead
2014-09-09 14:03:42 +02:00
fluffypony
6afbdd9754
FreeBSD alloca.h reference fixed
2014-09-09 12:37:19 +02:00
fluffypony
4ba680f294
a few more error messages moved to log level 1
2014-09-09 12:28:16 +02:00
fluffypony
cf5a8b1d6c
moved non-critical warnings and errors to log level 1
2014-09-09 11:32:00 +02:00
Riccardo Spagni
bf972c40fc
Merge pull request #123 from fluffypony/master
...
build number increase after release
2014-09-07 08:38:54 +02:00
fluffypony
4290c78160
build number increase after release
2014-09-07 08:33:41 +02:00