Merge branch '2022'

This commit is contained in:
Peter Johnson
2021-05-09 14:15:40 -07:00
765 changed files with 5914 additions and 13714 deletions

View File

@@ -40,7 +40,7 @@ class MechanismRoot2d : private MechanismObject2d {
using MechanismObject2d::Append;
private:
void UpdateEntries(std::shared_ptr<NetworkTable> table) override;
void UpdateEntries(std::shared_ptr<nt::NetworkTable> table) override;
inline void Flush();
double m_x;
double m_y;