8 commits

Author	SHA1	Message	Date
Grant Limberg	a0efea8e0f	Merge branch 'dev' into edge ... # Conflicts: # .gitignore # Jenkinsfile # attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist # attic/service/OneService.cpp	2020-02-03 13:54:49 -08:00
Adam Ierymenko	70648d006d	Merge branch 'dev' into edge	2019-09-05 11:06:27 -07:00
Adam Ierymenko	7566d4fbab	Merge dev	2019-09-04 14:38:35 -07:00
Adam Ierymenko	9d1207b339	Merge branch 'dev' into edge	2019-08-28 07:31:33 -07:00
Adam Ierymenko	ea65386e15	Merge branch 'dev' into edge	2019-08-26 12:22:20 -07:00
Adam Ierymenko	b6d7a95028	Merge branch 'dev' into edge	2019-08-26 11:09:19 -07:00
Adam Ierymenko	c79360f58b	Merge dev	2019-08-23 11:37:40 -07:00
Grant Limberg	cb4ebfdbd2	Dragging adam into CMake kicking and screaming :)	2019-08-16 10:45:14 -07:00

Renamed from make-linux.mk (Browse further)