From 12b2761fd6754d8af9640f0fdebd1e9e2007bbd8 Mon Sep 17 00:00:00 2001 From: EspoTek Date: Thu, 18 May 2017 10:29:17 +1000 Subject: [PATCH] Mac fixes now no longer break Windows. Former-commit-id: d8643a8ecda5aa97f2b908b42685f084fae84598 --- Desktop_Interface/Labrador.pro.REMOVED.git-id | 2 +- Desktop_Interface/Labrador.pro.user.269d77a.REMOVED.git-id | 1 + Desktop_Interface/Makefile.Debug.REMOVED.git-id | 2 +- Desktop_Interface/Makefile.REMOVED.git-id | 2 +- Desktop_Interface/Makefile.Release.REMOVED.git-id | 2 +- Desktop_Interface/bin/Labrador.exe.REMOVED.git-id | 2 +- Desktop_Interface/desktop_settings.cpp.REMOVED.git-id | 2 +- Desktop_Interface/genericusbdriver.h.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_buffercontrol.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_cursorenabler.cpp.REMOVED.git-id | 2 +- .../moc/moc_deviceconnecteddisplay.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_espocombobox.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_esposlider.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_espospinbox.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_functiongencontrol.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_genericusbdriver.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_isobuffer.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_isodriver.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_mainwindow.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_noclosemenu.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_qcustomplot.cpp.REMOVED.git-id | 2 +- .../moc/moc_scoperangeenterdialog.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_swipeystack.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_timedtickbox.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_voltagespinbox.cpp.REMOVED.git-id | 2 +- Desktop_Interface/moc/moc_winusbdriver.cpp.REMOVED.git-id | 2 +- Desktop_Interface/release/buffercontrol.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/cursorenabler.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/desktop_settings.obj.REMOVED.git-id | 2 +- .../release/deviceconnecteddisplay.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/espocombobox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/esposlider.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/espospinbox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/functiongencontrol.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/genericusbdriver.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/isobuffer.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/isobufferbuffer.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/isodriver.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/main.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/mainwindow.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_buffercontrol.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_cursorenabler.obj.REMOVED.git-id | 2 +- .../release/moc_deviceconnecteddisplay.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_espocombobox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_esposlider.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_espospinbox.obj.REMOVED.git-id | 2 +- .../release/moc_functiongencontrol.obj.REMOVED.git-id | 2 +- .../release/moc_genericusbdriver.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_isobuffer.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_isodriver.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_mainwindow.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_noclosemenu.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_qcustomplot.obj.REMOVED.git-id | 2 +- .../release/moc_scoperangeenterdialog.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_swipeystack.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_timedtickbox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_voltagespinbox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/moc_winusbdriver.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/noclosemenu.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/qcustomplot.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/qrc_resources.obj.REMOVED.git-id | 2 +- .../release/scoperangeenterdialog.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/siprint.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/swipeystack.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/timedtickbox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/voltagespinbox.obj.REMOVED.git-id | 2 +- Desktop_Interface/release/winusbdriver.obj.REMOVED.git-id | 2 +- Desktop_Interface/ui_mainwindow.h.REMOVED.git-id | 2 +- Desktop_Interface/ui_scoperangeenterdialog.h.REMOVED.git-id | 2 +- 69 files changed, 69 insertions(+), 68 deletions(-) create mode 100644 Desktop_Interface/Labrador.pro.user.269d77a.REMOVED.git-id diff --git a/Desktop_Interface/Labrador.pro.REMOVED.git-id b/Desktop_Interface/Labrador.pro.REMOVED.git-id index f066e454..d5688065 100644 --- a/Desktop_Interface/Labrador.pro.REMOVED.git-id +++ b/Desktop_Interface/Labrador.pro.REMOVED.git-id @@ -1 +1 @@ -83e67e1109e65ae2d2b6b50e01e24a4e550726b6 \ No newline at end of file +3a5f9ab10ba4d4f33dc231b6e2eb58db917148e7 \ No newline at end of file diff --git a/Desktop_Interface/Labrador.pro.user.269d77a.REMOVED.git-id b/Desktop_Interface/Labrador.pro.user.269d77a.REMOVED.git-id new file mode 100644 index 00000000..b7ef363d --- /dev/null +++ b/Desktop_Interface/Labrador.pro.user.269d77a.REMOVED.git-id @@ -0,0 +1 @@ +4d6179d792aa5e6067b59c47ae00e2cc7ccb934c \ No newline at end of file diff --git a/Desktop_Interface/Makefile.Debug.REMOVED.git-id b/Desktop_Interface/Makefile.Debug.REMOVED.git-id index cdbeeafb..4a57af4c 100644 --- a/Desktop_Interface/Makefile.Debug.REMOVED.git-id +++ b/Desktop_Interface/Makefile.Debug.REMOVED.git-id @@ -1 +1 @@ -0bb37c51c703cd3e22fa62fc503a598a100e8e28 \ No newline at end of file +42512a8c0ce6e11d671cdde258fb07fc4db8ffc1 \ No newline at end of file diff --git a/Desktop_Interface/Makefile.REMOVED.git-id b/Desktop_Interface/Makefile.REMOVED.git-id index 53d62bd2..d3cd1a7a 100644 --- a/Desktop_Interface/Makefile.REMOVED.git-id +++ b/Desktop_Interface/Makefile.REMOVED.git-id @@ -1 +1 @@ -644ed0b668eee8318459515029e9d16b88274efe \ No newline at end of file +70da724aad605bf59b5af8fb575d95706c0342c5 \ No newline at end of file diff --git a/Desktop_Interface/Makefile.Release.REMOVED.git-id b/Desktop_Interface/Makefile.Release.REMOVED.git-id index cf816bf3..dac1bdc5 100644 --- a/Desktop_Interface/Makefile.Release.REMOVED.git-id +++ b/Desktop_Interface/Makefile.Release.REMOVED.git-id @@ -1 +1 @@ -23e331b4c16f650d190ed51877460de19110ec18 \ No newline at end of file +6af9bd657047d89949c27c6fef25cd0e31655c98 \ No newline at end of file diff --git a/Desktop_Interface/bin/Labrador.exe.REMOVED.git-id b/Desktop_Interface/bin/Labrador.exe.REMOVED.git-id index dd7f6496..1f931413 100644 --- a/Desktop_Interface/bin/Labrador.exe.REMOVED.git-id +++ b/Desktop_Interface/bin/Labrador.exe.REMOVED.git-id @@ -1 +1 @@ -15abfdf6da7c46458b0974c17e2cb261d1fdb784 \ No newline at end of file +59171cbd659c6aad5d2de4791e1e6a0553e23b3f \ No newline at end of file diff --git a/Desktop_Interface/desktop_settings.cpp.REMOVED.git-id b/Desktop_Interface/desktop_settings.cpp.REMOVED.git-id index dc79605f..2d864251 100644 --- a/Desktop_Interface/desktop_settings.cpp.REMOVED.git-id +++ b/Desktop_Interface/desktop_settings.cpp.REMOVED.git-id @@ -1 +1 @@ -24724e02b873b89943e479da51fabef78a6b1d51 \ No newline at end of file +6a874e5c8a558e49b953ca277ab6c53a78a9d052 \ No newline at end of file diff --git a/Desktop_Interface/genericusbdriver.h.REMOVED.git-id b/Desktop_Interface/genericusbdriver.h.REMOVED.git-id index a2181404..c6b03934 100644 --- a/Desktop_Interface/genericusbdriver.h.REMOVED.git-id +++ b/Desktop_Interface/genericusbdriver.h.REMOVED.git-id @@ -1 +1 @@ -0d138ad514b96ff0beb617f576202e6b45476920 \ No newline at end of file +e1abdb1281fd129937f45b29683d2849208ce6fc \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_buffercontrol.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_buffercontrol.cpp.REMOVED.git-id index 6cf92518..4cf2cbaf 100644 --- a/Desktop_Interface/moc/moc_buffercontrol.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_buffercontrol.cpp.REMOVED.git-id @@ -1 +1 @@ -633ffe226b5a9d0a8ee4c06878ddb1349bb85c48 \ No newline at end of file +63da6edb4c702d0aa3127138c3db346e2e9a4704 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_cursorenabler.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_cursorenabler.cpp.REMOVED.git-id index ea35d3bd..47f95882 100644 --- a/Desktop_Interface/moc/moc_cursorenabler.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_cursorenabler.cpp.REMOVED.git-id @@ -1 +1 @@ -016c4e0febf7b4267d76b92977beb8d0a44e6495 \ No newline at end of file +6599974c2ea29bb1ccfbbfbfe21347215917e52f \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_deviceconnecteddisplay.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_deviceconnecteddisplay.cpp.REMOVED.git-id index 3248dde6..ce6df0b3 100644 --- a/Desktop_Interface/moc/moc_deviceconnecteddisplay.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_deviceconnecteddisplay.cpp.REMOVED.git-id @@ -1 +1 @@ -4a20295f178789a99991e36da7ea0899f95a18a2 \ No newline at end of file +8ce70a35f34e06121037e18bd1e6cf3177ccf63f \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_espocombobox.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_espocombobox.cpp.REMOVED.git-id index ce956cf9..844c4f44 100644 --- a/Desktop_Interface/moc/moc_espocombobox.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_espocombobox.cpp.REMOVED.git-id @@ -1 +1 @@ -eb1302efe8394f8d9ed86d5cdf55f350175913f9 \ No newline at end of file +a2d52fcfdab3d23d618706af6005be0ac145b515 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_esposlider.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_esposlider.cpp.REMOVED.git-id index 85a65a0f..47e83ff1 100644 --- a/Desktop_Interface/moc/moc_esposlider.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_esposlider.cpp.REMOVED.git-id @@ -1 +1 @@ -094e9b0dfb040395632952a82560ff11b718b0bd \ No newline at end of file +345b2b1acdb9b00cc77f0d34978f86797dedd2eb \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_espospinbox.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_espospinbox.cpp.REMOVED.git-id index f943f41a..9eedb655 100644 --- a/Desktop_Interface/moc/moc_espospinbox.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_espospinbox.cpp.REMOVED.git-id @@ -1 +1 @@ -0eec80565aed2bdcdda4819b7650d7e62c78ef1d \ No newline at end of file +372559f1f3c8355ff12bb1f1c956307627577bb3 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_functiongencontrol.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_functiongencontrol.cpp.REMOVED.git-id index 44dce8d2..e0fcda4c 100644 --- a/Desktop_Interface/moc/moc_functiongencontrol.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_functiongencontrol.cpp.REMOVED.git-id @@ -1 +1 @@ -2ca5f9bf77af9ee687b405740db4f96dd1ff207d \ No newline at end of file +8ae8f9540af7474dea01df31887e3aacbe6b63ec \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_genericusbdriver.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_genericusbdriver.cpp.REMOVED.git-id index 1b6ac02d..bf935bc7 100644 --- a/Desktop_Interface/moc/moc_genericusbdriver.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_genericusbdriver.cpp.REMOVED.git-id @@ -1 +1 @@ -44462224f5175a9c88881c900a8fda8ab7e9a861 \ No newline at end of file +f181208655286f7eafdc163a0bcb84c0220fbe4d \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_isobuffer.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_isobuffer.cpp.REMOVED.git-id index 7653ea48..510c502f 100644 --- a/Desktop_Interface/moc/moc_isobuffer.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_isobuffer.cpp.REMOVED.git-id @@ -1 +1 @@ -fe3e54b528ce157e13e5b8a1af85f1e86a9f8e9d \ No newline at end of file +07b3342ea468c0d0948114c405c645405dc535e3 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_isodriver.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_isodriver.cpp.REMOVED.git-id index 83da6e78..c6ebd819 100644 --- a/Desktop_Interface/moc/moc_isodriver.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_isodriver.cpp.REMOVED.git-id @@ -1 +1 @@ -d4f9f4a74345784b824d7e6dd4b92556ed26e4fd \ No newline at end of file +8b58115dacaa92ec31d588cc916728bda45bfcbf \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_mainwindow.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_mainwindow.cpp.REMOVED.git-id index be428ec3..18a167a1 100644 --- a/Desktop_Interface/moc/moc_mainwindow.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_mainwindow.cpp.REMOVED.git-id @@ -1 +1 @@ -225cee248601d7b5fede3d75b30a2aa0fea49fc0 \ No newline at end of file +9684e39428e84650a5c8608030c112c9fb9de6ec \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_noclosemenu.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_noclosemenu.cpp.REMOVED.git-id index 4710644b..34b65f22 100644 --- a/Desktop_Interface/moc/moc_noclosemenu.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_noclosemenu.cpp.REMOVED.git-id @@ -1 +1 @@ -ccd2ee39ee037a0e117ac279ca8ad5e52a2bc74e \ No newline at end of file +ff18d421c3e6407286f070a13a01baa96f07409e \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_qcustomplot.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_qcustomplot.cpp.REMOVED.git-id index 0a245958..a0cd8ef8 100644 --- a/Desktop_Interface/moc/moc_qcustomplot.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_qcustomplot.cpp.REMOVED.git-id @@ -1 +1 @@ -05c140508f28170a9a0913fb27808ad855976ea4 \ No newline at end of file +4af94f5668b3b2e21e490f11362ab5a64c5f18c2 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_scoperangeenterdialog.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_scoperangeenterdialog.cpp.REMOVED.git-id index 7e8ee43a..02327110 100644 --- a/Desktop_Interface/moc/moc_scoperangeenterdialog.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_scoperangeenterdialog.cpp.REMOVED.git-id @@ -1 +1 @@ -787de1ab1aa0de2c36662dc57c8f531434033c2d \ No newline at end of file +a39cb62586c0fca1008188f604603ceacb652c94 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_swipeystack.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_swipeystack.cpp.REMOVED.git-id index f4117ff9..2a0b65dc 100644 --- a/Desktop_Interface/moc/moc_swipeystack.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_swipeystack.cpp.REMOVED.git-id @@ -1 +1 @@ -9070f74b14ad8e39f0f8a3bb5643bb0928649500 \ No newline at end of file +b28a9646a52b2f0e6b05ac963bf54c12e2e011bf \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_timedtickbox.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_timedtickbox.cpp.REMOVED.git-id index 4fb76af9..5fad10e8 100644 --- a/Desktop_Interface/moc/moc_timedtickbox.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_timedtickbox.cpp.REMOVED.git-id @@ -1 +1 @@ -5da93e4f3ccdf51f0c94a9e76159a2aff2565299 \ No newline at end of file +d117428bbb7212a4ed6d59fd0b7778b896bf35b6 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_voltagespinbox.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_voltagespinbox.cpp.REMOVED.git-id index a896f819..2fc4fac7 100644 --- a/Desktop_Interface/moc/moc_voltagespinbox.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_voltagespinbox.cpp.REMOVED.git-id @@ -1 +1 @@ -2f7ab93a0e184b499898ca8b3085e76c7d8f4304 \ No newline at end of file +d4a3843fef240b463ade147b717a05acb7223916 \ No newline at end of file diff --git a/Desktop_Interface/moc/moc_winusbdriver.cpp.REMOVED.git-id b/Desktop_Interface/moc/moc_winusbdriver.cpp.REMOVED.git-id index 0b611a4e..2807b2da 100644 --- a/Desktop_Interface/moc/moc_winusbdriver.cpp.REMOVED.git-id +++ b/Desktop_Interface/moc/moc_winusbdriver.cpp.REMOVED.git-id @@ -1 +1 @@ -b7839fce16d69a35dbc7c72143c442c4436ffa7d \ No newline at end of file +15ac24dd02aaa54ee68f52539b63e7fe75a8423b \ No newline at end of file diff --git a/Desktop_Interface/release/buffercontrol.obj.REMOVED.git-id b/Desktop_Interface/release/buffercontrol.obj.REMOVED.git-id index 93e4ccac..d121120b 100644 --- a/Desktop_Interface/release/buffercontrol.obj.REMOVED.git-id +++ b/Desktop_Interface/release/buffercontrol.obj.REMOVED.git-id @@ -1 +1 @@ -a174683798db95c3cec3a69760b29854c38a8013 \ No newline at end of file +e8a2b3680247a17c010519747c0be69ae0dcfcb4 \ No newline at end of file diff --git a/Desktop_Interface/release/cursorenabler.obj.REMOVED.git-id b/Desktop_Interface/release/cursorenabler.obj.REMOVED.git-id index 555b3c3f..76dc33f8 100644 --- a/Desktop_Interface/release/cursorenabler.obj.REMOVED.git-id +++ b/Desktop_Interface/release/cursorenabler.obj.REMOVED.git-id @@ -1 +1 @@ -53ff6877101a4948a773ac934eab484457954366 \ No newline at end of file +4e3bb90ac5f89f4dbe8f26133bc9c045b7508837 \ No newline at end of file diff --git a/Desktop_Interface/release/desktop_settings.obj.REMOVED.git-id b/Desktop_Interface/release/desktop_settings.obj.REMOVED.git-id index b1bf65e6..3b3b0cee 100644 --- a/Desktop_Interface/release/desktop_settings.obj.REMOVED.git-id +++ b/Desktop_Interface/release/desktop_settings.obj.REMOVED.git-id @@ -1 +1 @@ -669789a6e3d16f0a0408d5f9b7128d9831afce09 \ No newline at end of file +7f8e646bb223a18b047c10bf13b3c91c3489f90c \ No newline at end of file diff --git a/Desktop_Interface/release/deviceconnecteddisplay.obj.REMOVED.git-id b/Desktop_Interface/release/deviceconnecteddisplay.obj.REMOVED.git-id index 9948f761..7f885c6f 100644 --- a/Desktop_Interface/release/deviceconnecteddisplay.obj.REMOVED.git-id +++ b/Desktop_Interface/release/deviceconnecteddisplay.obj.REMOVED.git-id @@ -1 +1 @@ -b78e09ddb3573a9656cebc82e9de6774cf6738ad \ No newline at end of file +26f6f40eff9a850a30ec9a814230fe63e15ada2a \ No newline at end of file diff --git a/Desktop_Interface/release/espocombobox.obj.REMOVED.git-id b/Desktop_Interface/release/espocombobox.obj.REMOVED.git-id index 56676172..acbbb471 100644 --- a/Desktop_Interface/release/espocombobox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/espocombobox.obj.REMOVED.git-id @@ -1 +1 @@ -2d3c37061155373417abf3b5322550df868946bf \ No newline at end of file +27d48f0a946e88e929e0123e245518abdc6e8076 \ No newline at end of file diff --git a/Desktop_Interface/release/esposlider.obj.REMOVED.git-id b/Desktop_Interface/release/esposlider.obj.REMOVED.git-id index 22b4afc0..e4eb4379 100644 --- a/Desktop_Interface/release/esposlider.obj.REMOVED.git-id +++ b/Desktop_Interface/release/esposlider.obj.REMOVED.git-id @@ -1 +1 @@ -5b374dd560c55c79472f0e21af47c4657bacbeda \ No newline at end of file +08264f1a453a2242b3c6e36574664b8d410e8a5e \ No newline at end of file diff --git a/Desktop_Interface/release/espospinbox.obj.REMOVED.git-id b/Desktop_Interface/release/espospinbox.obj.REMOVED.git-id index 6923f55f..2d7cdda4 100644 --- a/Desktop_Interface/release/espospinbox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/espospinbox.obj.REMOVED.git-id @@ -1 +1 @@ -cf1a60417f496ff6c6f9f414e89b1a922ab96eab \ No newline at end of file +159e844e0c94cd92b6cd314e6b309f9ada121260 \ No newline at end of file diff --git a/Desktop_Interface/release/functiongencontrol.obj.REMOVED.git-id b/Desktop_Interface/release/functiongencontrol.obj.REMOVED.git-id index a1901f8b..86cb394a 100644 --- a/Desktop_Interface/release/functiongencontrol.obj.REMOVED.git-id +++ b/Desktop_Interface/release/functiongencontrol.obj.REMOVED.git-id @@ -1 +1 @@ -b7dcb3838a8a0c991240f12d2856d424e466a946 \ No newline at end of file +a06f84d1e587bc11391fa0e7c01df41a12a546e2 \ No newline at end of file diff --git a/Desktop_Interface/release/genericusbdriver.obj.REMOVED.git-id b/Desktop_Interface/release/genericusbdriver.obj.REMOVED.git-id index a9b152e6..e324f28f 100644 --- a/Desktop_Interface/release/genericusbdriver.obj.REMOVED.git-id +++ b/Desktop_Interface/release/genericusbdriver.obj.REMOVED.git-id @@ -1 +1 @@ -6ad4ad105134edd5b27a519a850e8a10cf36cdba \ No newline at end of file +72bac4eacb6949dedcad6c78be4579d1d2106a4b \ No newline at end of file diff --git a/Desktop_Interface/release/isobuffer.obj.REMOVED.git-id b/Desktop_Interface/release/isobuffer.obj.REMOVED.git-id index d04cdd2c..40c4af5c 100644 --- a/Desktop_Interface/release/isobuffer.obj.REMOVED.git-id +++ b/Desktop_Interface/release/isobuffer.obj.REMOVED.git-id @@ -1 +1 @@ -b50a3532d9c78cf5b0eb44ec245f8b46783271c0 \ No newline at end of file +53ab57085a0e6de5e8b07f5d55212a99a92ba65d \ No newline at end of file diff --git a/Desktop_Interface/release/isobufferbuffer.obj.REMOVED.git-id b/Desktop_Interface/release/isobufferbuffer.obj.REMOVED.git-id index 54bf70f3..ee610a19 100644 --- a/Desktop_Interface/release/isobufferbuffer.obj.REMOVED.git-id +++ b/Desktop_Interface/release/isobufferbuffer.obj.REMOVED.git-id @@ -1 +1 @@ -9bd6a4b8ad41a6d32a58f3b7f5b75404557d1593 \ No newline at end of file +b8f4ae645a266e08a158a5a552afbbf7b55bf505 \ No newline at end of file diff --git a/Desktop_Interface/release/isodriver.obj.REMOVED.git-id b/Desktop_Interface/release/isodriver.obj.REMOVED.git-id index 6b988ef6..723862a3 100644 --- a/Desktop_Interface/release/isodriver.obj.REMOVED.git-id +++ b/Desktop_Interface/release/isodriver.obj.REMOVED.git-id @@ -1 +1 @@ -0f3a3148acf0f57b21c20879d7817970a450cdd4 \ No newline at end of file +951980fce26d61b60d1a8ae47074228f1a26ad1b \ No newline at end of file diff --git a/Desktop_Interface/release/main.obj.REMOVED.git-id b/Desktop_Interface/release/main.obj.REMOVED.git-id index 2124c143..9bb65809 100644 --- a/Desktop_Interface/release/main.obj.REMOVED.git-id +++ b/Desktop_Interface/release/main.obj.REMOVED.git-id @@ -1 +1 @@ -0b0a60538365632510a578797b067f82b44abfca \ No newline at end of file +4c6131a978f37149a10a9d45f388d79fc0c6b318 \ No newline at end of file diff --git a/Desktop_Interface/release/mainwindow.obj.REMOVED.git-id b/Desktop_Interface/release/mainwindow.obj.REMOVED.git-id index 673a1dae..b78a9af1 100644 --- a/Desktop_Interface/release/mainwindow.obj.REMOVED.git-id +++ b/Desktop_Interface/release/mainwindow.obj.REMOVED.git-id @@ -1 +1 @@ -4488fdf317ab4eaedfc2461efa80ac44a528db53 \ No newline at end of file +c8c7254b5bc37aec0023ecafc5548654ef441a61 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_buffercontrol.obj.REMOVED.git-id b/Desktop_Interface/release/moc_buffercontrol.obj.REMOVED.git-id index d272b669..c440ad69 100644 --- a/Desktop_Interface/release/moc_buffercontrol.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_buffercontrol.obj.REMOVED.git-id @@ -1 +1 @@ -6e04ce56b45572ece589d0778f51967b97dae8fe \ No newline at end of file +23d03613dbd92209149b2a4decfa663a78fee0ec \ No newline at end of file diff --git a/Desktop_Interface/release/moc_cursorenabler.obj.REMOVED.git-id b/Desktop_Interface/release/moc_cursorenabler.obj.REMOVED.git-id index 991a4d19..fe705847 100644 --- a/Desktop_Interface/release/moc_cursorenabler.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_cursorenabler.obj.REMOVED.git-id @@ -1 +1 @@ -ff8542ae10363b19f88176d0a890528149d48707 \ No newline at end of file +8140fe6749980e96ff7a2e37a5468f613f4da2db \ No newline at end of file diff --git a/Desktop_Interface/release/moc_deviceconnecteddisplay.obj.REMOVED.git-id b/Desktop_Interface/release/moc_deviceconnecteddisplay.obj.REMOVED.git-id index 4c3ff5de..8895450a 100644 --- a/Desktop_Interface/release/moc_deviceconnecteddisplay.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_deviceconnecteddisplay.obj.REMOVED.git-id @@ -1 +1 @@ -db92f8ba39140e4251edcab4992c061023dee22f \ No newline at end of file +0c10ac22c73bd806d727363dac6ee1fae8b977c0 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_espocombobox.obj.REMOVED.git-id b/Desktop_Interface/release/moc_espocombobox.obj.REMOVED.git-id index 70724630..849f4f7c 100644 --- a/Desktop_Interface/release/moc_espocombobox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_espocombobox.obj.REMOVED.git-id @@ -1 +1 @@ -7077f1096cb70b35db7f3ee1740042cfc156761d \ No newline at end of file +2a16a335dd2536ae2a493d319e461d9dfad138b4 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_esposlider.obj.REMOVED.git-id b/Desktop_Interface/release/moc_esposlider.obj.REMOVED.git-id index 190355f5..faca0956 100644 --- a/Desktop_Interface/release/moc_esposlider.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_esposlider.obj.REMOVED.git-id @@ -1 +1 @@ -565d1ae39e3836d55179eb4d7cc469d9738fed29 \ No newline at end of file +48d1756366cc2afaa3b6080f1355dfe9178fd176 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_espospinbox.obj.REMOVED.git-id b/Desktop_Interface/release/moc_espospinbox.obj.REMOVED.git-id index 03a4ef1f..f3b7b222 100644 --- a/Desktop_Interface/release/moc_espospinbox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_espospinbox.obj.REMOVED.git-id @@ -1 +1 @@ -eeec62d5155fbaf275b0e914f97b40e0f6b7db9c \ No newline at end of file +6e1bacb5667f3697f44bc3d541c079a7c9fe375a \ No newline at end of file diff --git a/Desktop_Interface/release/moc_functiongencontrol.obj.REMOVED.git-id b/Desktop_Interface/release/moc_functiongencontrol.obj.REMOVED.git-id index 110d5f57..fa8d6b69 100644 --- a/Desktop_Interface/release/moc_functiongencontrol.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_functiongencontrol.obj.REMOVED.git-id @@ -1 +1 @@ -e7df3e8c1e0e624f5b6a2190a30b06ce05f355c0 \ No newline at end of file +f05071cf0b72c1420aec56612545f15788c3a280 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_genericusbdriver.obj.REMOVED.git-id b/Desktop_Interface/release/moc_genericusbdriver.obj.REMOVED.git-id index 77ccf376..4ea2571a 100644 --- a/Desktop_Interface/release/moc_genericusbdriver.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_genericusbdriver.obj.REMOVED.git-id @@ -1 +1 @@ -b7afbb0cf2afd0a93363b75552307a055c8b94b8 \ No newline at end of file +1009f17ee14dcbafa60e43a367534e180a4e31fd \ No newline at end of file diff --git a/Desktop_Interface/release/moc_isobuffer.obj.REMOVED.git-id b/Desktop_Interface/release/moc_isobuffer.obj.REMOVED.git-id index d248ee71..a3a839a6 100644 --- a/Desktop_Interface/release/moc_isobuffer.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_isobuffer.obj.REMOVED.git-id @@ -1 +1 @@ -4c2247c62ae8fd701811f786ed6f745ca3125ed3 \ No newline at end of file +34d00576f047dc9b42aad26969519c4df8eb0d61 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_isodriver.obj.REMOVED.git-id b/Desktop_Interface/release/moc_isodriver.obj.REMOVED.git-id index 4933730a..a866be97 100644 --- a/Desktop_Interface/release/moc_isodriver.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_isodriver.obj.REMOVED.git-id @@ -1 +1 @@ -9e70126415e201f8e868c5eac0385efcb305eb2c \ No newline at end of file +ca5121ae6f0a2326e92816cd16b494346240ae90 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_mainwindow.obj.REMOVED.git-id b/Desktop_Interface/release/moc_mainwindow.obj.REMOVED.git-id index 795719d7..631b6273 100644 --- a/Desktop_Interface/release/moc_mainwindow.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_mainwindow.obj.REMOVED.git-id @@ -1 +1 @@ -addeec8eb8b56566df285d954accfd3c03e92adb \ No newline at end of file +e0fa287e5a2ff5add3627fe78357dcac44a1971f \ No newline at end of file diff --git a/Desktop_Interface/release/moc_noclosemenu.obj.REMOVED.git-id b/Desktop_Interface/release/moc_noclosemenu.obj.REMOVED.git-id index 35c3946d..a88e9983 100644 --- a/Desktop_Interface/release/moc_noclosemenu.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_noclosemenu.obj.REMOVED.git-id @@ -1 +1 @@ -27ac87cbd53b531a922b978f98cdf21cbd5e4684 \ No newline at end of file +66e92d53d0e137677e93da5ee19a870d6bc710cc \ No newline at end of file diff --git a/Desktop_Interface/release/moc_qcustomplot.obj.REMOVED.git-id b/Desktop_Interface/release/moc_qcustomplot.obj.REMOVED.git-id index c5cc1855..48aa6523 100644 --- a/Desktop_Interface/release/moc_qcustomplot.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_qcustomplot.obj.REMOVED.git-id @@ -1 +1 @@ -572cd1de3136d1c09ab550a4f0e37d8e54766c2c \ No newline at end of file +8de7d5ecf4f17fe76f8b03d94d03f31963a5769b \ No newline at end of file diff --git a/Desktop_Interface/release/moc_scoperangeenterdialog.obj.REMOVED.git-id b/Desktop_Interface/release/moc_scoperangeenterdialog.obj.REMOVED.git-id index f009bd45..239dca56 100644 --- a/Desktop_Interface/release/moc_scoperangeenterdialog.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_scoperangeenterdialog.obj.REMOVED.git-id @@ -1 +1 @@ -4d2b21a47421391d99ff3bd06865a3ae87cbd615 \ No newline at end of file +4b31aa0dadeacb78a21c52905aa522b20b039826 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_swipeystack.obj.REMOVED.git-id b/Desktop_Interface/release/moc_swipeystack.obj.REMOVED.git-id index 7410c9b3..1a460798 100644 --- a/Desktop_Interface/release/moc_swipeystack.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_swipeystack.obj.REMOVED.git-id @@ -1 +1 @@ -3126c696cfc7cb7425c4ff26a9a5103b64bcbc9c \ No newline at end of file +db0d32036110ea38d23802f3fabce8a972f47b42 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_timedtickbox.obj.REMOVED.git-id b/Desktop_Interface/release/moc_timedtickbox.obj.REMOVED.git-id index abd2e9ec..366ad3fe 100644 --- a/Desktop_Interface/release/moc_timedtickbox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_timedtickbox.obj.REMOVED.git-id @@ -1 +1 @@ -2aa35a49b5447757713afa19af4c2928f2d41197 \ No newline at end of file +9886bdf92a5fe2c5a2579cc278d00d988e29ac60 \ No newline at end of file diff --git a/Desktop_Interface/release/moc_voltagespinbox.obj.REMOVED.git-id b/Desktop_Interface/release/moc_voltagespinbox.obj.REMOVED.git-id index b2ef75be..142360f8 100644 --- a/Desktop_Interface/release/moc_voltagespinbox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_voltagespinbox.obj.REMOVED.git-id @@ -1 +1 @@ -56b204753a385840594098e70b959932eee5b66e \ No newline at end of file +2cbc53584795d42d9064f77f9ff26decec4244bf \ No newline at end of file diff --git a/Desktop_Interface/release/moc_winusbdriver.obj.REMOVED.git-id b/Desktop_Interface/release/moc_winusbdriver.obj.REMOVED.git-id index 238fa513..adb80166 100644 --- a/Desktop_Interface/release/moc_winusbdriver.obj.REMOVED.git-id +++ b/Desktop_Interface/release/moc_winusbdriver.obj.REMOVED.git-id @@ -1 +1 @@ -30c6590cd593c077411de1b3183d219a11f15e92 \ No newline at end of file +8159986f258199884710b1751a27f508da111a6e \ No newline at end of file diff --git a/Desktop_Interface/release/noclosemenu.obj.REMOVED.git-id b/Desktop_Interface/release/noclosemenu.obj.REMOVED.git-id index e01cac46..ac51415b 100644 --- a/Desktop_Interface/release/noclosemenu.obj.REMOVED.git-id +++ b/Desktop_Interface/release/noclosemenu.obj.REMOVED.git-id @@ -1 +1 @@ -b2eb22adb3e336e34b6a2b0a0da80cf2a257b84e \ No newline at end of file +5d1cb91be41653467e8faaf071c5c564f91272ad \ No newline at end of file diff --git a/Desktop_Interface/release/qcustomplot.obj.REMOVED.git-id b/Desktop_Interface/release/qcustomplot.obj.REMOVED.git-id index 18964397..c537e72c 100644 --- a/Desktop_Interface/release/qcustomplot.obj.REMOVED.git-id +++ b/Desktop_Interface/release/qcustomplot.obj.REMOVED.git-id @@ -1 +1 @@ -1c76054215a9a888c737ad0df67154e327598fb9 \ No newline at end of file +d9639d0c004da6cb22a3d18d430cc8ab9b19c596 \ No newline at end of file diff --git a/Desktop_Interface/release/qrc_resources.obj.REMOVED.git-id b/Desktop_Interface/release/qrc_resources.obj.REMOVED.git-id index 15aa9c86..dfbc6d7d 100644 --- a/Desktop_Interface/release/qrc_resources.obj.REMOVED.git-id +++ b/Desktop_Interface/release/qrc_resources.obj.REMOVED.git-id @@ -1 +1 @@ -76c5ac0c25dc31b43c1d774ed2a57a0cd1a64388 \ No newline at end of file +7b35a8ff0a649dac93de94b1ac735d4c580e8eda \ No newline at end of file diff --git a/Desktop_Interface/release/scoperangeenterdialog.obj.REMOVED.git-id b/Desktop_Interface/release/scoperangeenterdialog.obj.REMOVED.git-id index ddecb113..c7892359 100644 --- a/Desktop_Interface/release/scoperangeenterdialog.obj.REMOVED.git-id +++ b/Desktop_Interface/release/scoperangeenterdialog.obj.REMOVED.git-id @@ -1 +1 @@ -8dcdc123219ad62cf6195b0cf387aa652de33eee \ No newline at end of file +e2432c91a3b1756c380efcc17c727922c3eebb98 \ No newline at end of file diff --git a/Desktop_Interface/release/siprint.obj.REMOVED.git-id b/Desktop_Interface/release/siprint.obj.REMOVED.git-id index 59ef23ae..c7ea22b3 100644 --- a/Desktop_Interface/release/siprint.obj.REMOVED.git-id +++ b/Desktop_Interface/release/siprint.obj.REMOVED.git-id @@ -1 +1 @@ -1d11b8a50594f957b8e6b5e4736b00c91371fc7e \ No newline at end of file +4bc2393941c328686e44e0a36f2e293f8bb2648f \ No newline at end of file diff --git a/Desktop_Interface/release/swipeystack.obj.REMOVED.git-id b/Desktop_Interface/release/swipeystack.obj.REMOVED.git-id index e20ec12b..dc29f730 100644 --- a/Desktop_Interface/release/swipeystack.obj.REMOVED.git-id +++ b/Desktop_Interface/release/swipeystack.obj.REMOVED.git-id @@ -1 +1 @@ -82a24465a6c689b8da175925fd741596efdaac7a \ No newline at end of file +4a41db01b66c5f9bc950a9e47e76b8f7f614182b \ No newline at end of file diff --git a/Desktop_Interface/release/timedtickbox.obj.REMOVED.git-id b/Desktop_Interface/release/timedtickbox.obj.REMOVED.git-id index 19f3e6c9..f04c3cbb 100644 --- a/Desktop_Interface/release/timedtickbox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/timedtickbox.obj.REMOVED.git-id @@ -1 +1 @@ -e74a1196aec6c9cc7c812b7423dd307d9e7d34ec \ No newline at end of file +e376c68edba558f821fd353519a893b333418f00 \ No newline at end of file diff --git a/Desktop_Interface/release/voltagespinbox.obj.REMOVED.git-id b/Desktop_Interface/release/voltagespinbox.obj.REMOVED.git-id index 109dea32..44f77162 100644 --- a/Desktop_Interface/release/voltagespinbox.obj.REMOVED.git-id +++ b/Desktop_Interface/release/voltagespinbox.obj.REMOVED.git-id @@ -1 +1 @@ -66f3c0d1edd45d7b5be4b46a67fa23b47ee20482 \ No newline at end of file +8b92c4cfa3a29f8d28e296d170aa48683d0c7c3d \ No newline at end of file diff --git a/Desktop_Interface/release/winusbdriver.obj.REMOVED.git-id b/Desktop_Interface/release/winusbdriver.obj.REMOVED.git-id index 9b4e6540..212177d5 100644 --- a/Desktop_Interface/release/winusbdriver.obj.REMOVED.git-id +++ b/Desktop_Interface/release/winusbdriver.obj.REMOVED.git-id @@ -1 +1 @@ -66f034ed1606c9750227e1cf421cd439879c2c36 \ No newline at end of file +7f468af85ec68ca2577b707b07154ecb8c655686 \ No newline at end of file diff --git a/Desktop_Interface/ui_mainwindow.h.REMOVED.git-id b/Desktop_Interface/ui_mainwindow.h.REMOVED.git-id index 9f16baf9..a37d4c41 100644 --- a/Desktop_Interface/ui_mainwindow.h.REMOVED.git-id +++ b/Desktop_Interface/ui_mainwindow.h.REMOVED.git-id @@ -1 +1 @@ -fc78a37e5eab3689927f5650630f18899007510d \ No newline at end of file +9e0d558b64b1bf5c74ebdcbc5475ebe35c188e15 \ No newline at end of file diff --git a/Desktop_Interface/ui_scoperangeenterdialog.h.REMOVED.git-id b/Desktop_Interface/ui_scoperangeenterdialog.h.REMOVED.git-id index 38a1940e..a9520cf5 100644 --- a/Desktop_Interface/ui_scoperangeenterdialog.h.REMOVED.git-id +++ b/Desktop_Interface/ui_scoperangeenterdialog.h.REMOVED.git-id @@ -1 +1 @@ -d2502050a558e837df39ebe307538ee50d1def88 \ No newline at end of file +72b3b260a6b28be7a6623779fe69bda3456698f5 \ No newline at end of file