Noel Maersk 8079d054d6 Merge branch 'nfactor' ...

Conflicts (resolved):
	Makefile.am
	winbuild/sgminer.vcxproj.filters

2014-03-14 17:46:54 +02:00

..

CL

…

curl

VS2010 build: Added library building instructions.

2014-02-01 00:33:22 +02:00

sys

…

config.h

Bump version to 4.1.153.

2014-03-14 17:37:57 +02:00

curses.h

VS2010 build: Added library building instructions.

2014-02-01 00:33:22 +02:00

inttypes.h

Added algorithm.* and inttypes.h for MSVS build

2014-03-09 11:29:53 +01:00

jansson_config.h

…

libgen.h

…

pthread.h

…

sched.h

…

semaphore.h

…

stdbool.h

…

unistd.h

…

winbuild.h

VS2010 build: Fixed debug build. Moved some windows related defines to preprocessor.

2014-02-10 22:10:22 +01:00