Commit Graph

5 Commits

Author SHA1 Message Date
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
ca333
9d36579649 uni3 2017-10-09 11:45:49 +02:00
Joel Barker
e891d64b87 macifiy the build so that this compiles on a mac 2016-12-26 14:11:13 +08:00
Cory Fields
df7565d99c depends: add sensible download timeout/retry values 2014-08-27 03:40:30 -04:00
Cory Fields
1dec09b341 depends: add shared dependency builder
See the README's in depends for documentation
2014-08-08 15:10:46 -04:00