UdjinM6 48d0edcbdf Merge remote-tracking branch 'bitpay/0.12.1-bitcore' into dashBitcore1 ... Resolved Conflicts: .travis.yml (ignoring changes, leaving dash version) src/Makefile.am src/main.cpp src/main.h src/rpcclient.cpp src/rpcserver.cpp src/script/script.cpp src/script/script.h		2016-07-19 08:49:28 +03:00
..
bdb.mk
boost.mk	[Depends] Bump Boost, miniupnpc, ccache & zeromq	2015-12-18 09:42:09 +01:00
dbus.mk
expat.mk
fontconfig.mk
freetype.mk
libevent.mk	libevent: Windows reuseaddr workaround in depends	2015-09-03 10:59:19 +02:00
libICE.mk
libSM.mk
libX11.mk
libXau.mk
libxcb.mk	depends: fix a static qt5 crash when using certain versions of libxcb	2015-03-16 23:45:15 -04:00
libXext.mk
miniupnpc.mk	[depends] Fix miniupnpc compilation on osx	2016-01-08 10:43:38 +01:00
native_ccache.mk	[Depends] Bump Boost, miniupnpc, ccache & zeromq	2015-12-18 09:42:09 +01:00
native_cctools.mk	depends: sanity-check sources and cached builds	2015-05-14 01:33:07 -04:00
native_cdrkit.mk
native_comparisontool.mk	build: comparison tool NPE fix	2015-06-21 12:12:05 -04:00
native_libdmg-hfsplus.mk
native_protobuf.mk	Bump native protobuf to 2.6.1	2015-12-10 10:00:24 +07:00
openssl.mk	Merge remote-tracking branch 'bitcoin/0.12' into HEAD	2016-02-06 16:48:04 +03:00
packages.mk	depends: fix platform specific packages variable	2015-09-17 14:30:46 +02:00
protobuf.mk
qrencode.mk	depends: bump qrencode to 3.4.4	2015-07-03 17:21:55 -04:00
qt46.mk
qt.mk	travis: switch to Trusty	2016-06-02 12:15:37 -04:00
xcb_proto.mk
xextproto.mk
xproto.mk
xtrans.mk
zeromq.mk	[Depends] Bump Boost, miniupnpc, ccache & zeromq	2015-12-18 09:42:09 +01:00