Merge "v16 Image"

2026-07-03 03:01:44 +00:00 · 2014-10-22 10:46:43 -07:00
parent 455654a95b 70be534fe0
commit 213e73c43e
3 changed files with 2 additions and 1 deletions
--- a/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h
+++ b/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h
@@ -32,7 +32,7 @@ public:
   void enable(tRioStatusCode *status);
   void disable(tRioStatusCode *status);
   bool isEnabled(tRioStatusCode *status);
-public:
+private:
   class tInterruptThread;
   friend class tInterruptThread;
   void handler();
@@ -58,3 +58,4 @@ public:


 #endif // __tInterruptManager_h__
+
--- a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
+++ b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
--- a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
+++ b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0