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
..
historic	Add some historic code just for the heck of it.	2017-05-04 10:42:22 -07:00
macui	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
rule-compiler	Merge relicensing change from dev	2019-08-23 09:27:13 -07:00
service	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
webview	Work in progress...	2019-11-04 14:24:37 -08:00
windows	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
Buffer.hpp	Refactoring protocol marshal/unmarshal code...	2020-01-24 21:16:07 -08:00
cycle_controllers.sh	cleanup	2019-08-19 20:29:24 -07:00
make-bsd.mk	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
make-linux.mk	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
make-mac.mk	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
make-netbsd.mk	Dragging adam into CMake kicking and screaming :)	2019-08-16 10:45:14 -07:00
objects.mk	Dragging adam into CMake kicking and screaming :)	2019-08-16 10:45:14 -07:00
Packet.cpp	Refactoring protocol marshal/unmarshal code...	2020-01-24 21:16:07 -08:00
Packet.hpp	Refactoring protocol marshal/unmarshal code...	2020-01-24 21:16:07 -08:00
Str.hpp	Take Dictionary behind the barn...	2020-01-25 18:02:11 -08:00
TinyVector.hpp	A bunch of wiring up of stuff...	2020-01-17 14:01:22 -08:00
update_controllers.sh	cleanup	2019-08-19 20:29:24 -07:00
windows-clean.bat	.	2019-09-23 16:58:55 -07:00
ZeroTierDebug.h	Loads of refactoring, integration of new version of Trace.	2020-01-23 13:05:33 -08:00