mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	Desktop Interface/Labrador.pro.user


Former-commit-id: c1355d0862
This commit is contained in:
EspoTek 2016-10-26 10:33:16 +11:00
parent 323eede224 5f9ea98da5
commit e8e4dfd2ca
136 changed files with 133 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Desktop Interface/.qmake.stash.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
d717b0a6db909aaeb4fbcce9c2a2f627ae4ead71

2
Desktop Interface/Labrador.pro.REMOVED.git-id
View File

@ -1 +1 @@
6ea098268346f98a8355e655aa170c35aa597a5e
f7e6a58f1a37533edb578924a91207af87184dcc

1
Desktop Interface/Labrador.pro.user.5435f0c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
c02425f6649318aae5d0aa36256f086f3dd951df

2
Desktop Interface/Labrador.pro.user.REMOVED.git-id
View File

@ -1 +1 @@
bcc7715257d86e9484a7be8752f7ae1f556ec4f2
416da63a32da45f1dadf92b93cced6c4ed6c3bd1

2
Desktop Interface/Makefile.REMOVED.git-id
View File

@ -1 +1 @@
1c877836dd245e40e22060a90fbf3a8b0f2d75e8
7598df66d623269fa59eb6a131b3c9d2a5f6eaf9

1
Desktop Interface/bin/Labrador.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
633ddbf47041271e0e7437317648bb7833f9083c

0
Desktop Interface/bin/recordings/20161021080854757/375_CH1.csv Normal file
View File

0
Desktop Interface/bin/recordings/20161021080854757/375_CH2.csv Normal file
View File

0
Desktop Interface/bin/recordings/20161021080854757/750.csv Normal file
View File

1
Desktop Interface/buffercontrol.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
c3b03d880eaa6d3f586208783d013ca8fc83ecfe

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-core.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
380faa1e6f58bbda4aaa5a04319d7401302f93bb

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-darwin_usb.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9ce06a81ea45b2883a6faf07a0d2136bb2a4e647

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-descriptor.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
2a94c0c7b51306d4220a084f9630f1717637fc83

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-io.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
609f72ce09eef3a060abd59c88c273350aa6fc51

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-linux_usbfs.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
af8b02c9c8bfdd945bd3d1f83162cc02b844632f

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-openbsd_usb.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9ce06a81ea45b2883a6faf07a0d2136bb2a4e647

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-poll_windows.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9ce06a81ea45b2883a6faf07a0d2136bb2a4e647

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-sync.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
6d021155d6f957fe3e42b7ea0f5cbfae4c2ad5d5

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-threads_posix.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
7b84732297a15f00f6105a7158e66df59aceb89c

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-threads_windows.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9ce06a81ea45b2883a6faf07a0d2136bb2a4e647

1
Desktop Interface/build_linux/libusb/.deps/libusb_1_0_la-windows_usb.Plo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9ce06a81ea45b2883a6faf07a0d2136bb2a4e647

1
Desktop Interface/build_linux/libusb/.libs/libusb-1.0.a.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
58f08c1cdd3ce313e69eb89a2e215fbbfcb133a2

1
Desktop Interface/build_linux/libusb/.libs/libusb-1.0.la.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
cef8a8b55d7e55d312827f6ceb60f7bcefe3fd10

1
Desktop Interface/build_linux/libusb/.libs/libusb-1.0.lai.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
da83db80ee4f830abdb558bf1b877106bbd63243

1
Desktop Interface/build_linux/libusb/.libs/libusb-1.0.so.0.1.0.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
cbac0bf9fdac6e366fa848c680fa67798b6aa82b

1
Desktop Interface/build_linux/libusb/.libs/libusb-1.0.so.0.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
89984fe515ea4aceed7de3deb532d16e36ee680e

1
Desktop Interface/build_linux/libusb/.libs/libusb-1.0.so.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
89984fe515ea4aceed7de3deb532d16e36ee680e

1
Desktop Interface/build_linux/libusb/.libs/libusb_1_0_la-core.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
0312f2683b552a6130421d13aa7c5598364822c9

1
Desktop Interface/build_linux/libusb/.libs/libusb_1_0_la-descriptor.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e690180c2cf488bfc5d9793443abee98a86df703

1
Desktop Interface/build_linux/libusb/.libs/libusb_1_0_la-io.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
97ef7e658ac7230b7771e73ae19cccb5d680ce17

1
Desktop Interface/build_linux/libusb/.libs/libusb_1_0_la-linux_usbfs.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
ea85851c2229d3557f4032485e85ab49e5cad3b2

1
Desktop Interface/build_linux/libusb/.libs/libusb_1_0_la-sync.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
7bf7568fe30e864422151cd77e9c9e6e38bf3b2f

1
Desktop Interface/build_linux/libusb/.libs/libusb_1_0_la-threads_posix.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
aec887842e97ba268d86389060e7e30ed4406c1f

1
Desktop Interface/build_linux/libusb/Makefile.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
fece81fa30059e618fd5e36a8813c78df1b2d0ef

1
Desktop Interface/build_linux/libusb/Makefile.am.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
3316ebcbb817906f7da89d28e4f3e0258e847d19

1
Desktop Interface/build_linux/libusb/Makefile.in.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
193adaed9a54d3e5c7dc9548717f2d6db1e7d69c

1
Desktop Interface/build_linux/libusb/core.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
767dcbfabf160c48c0851d61cab7ca7d8483a92a

1
Desktop Interface/build_linux/libusb/descriptor.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e358e9e5925469fc3fe1ddd880e3d49f90bcdd14

1
Desktop Interface/build_linux/libusb/io.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e9bd312c8cc2d624b7c8826461bb1338162fd4b7

1
Desktop Interface/build_linux/libusb/libusb-1.0.def.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
1d6a5d2113ecb267676e35c1ef25e00a72b7614a

1
Desktop Interface/build_linux/libusb/libusb-1.0.la.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
384d0b2fc1be036b62efe29d57637f262f461f5d

1
Desktop Interface/build_linux/libusb/libusb-1.0.rc.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
a59a4307dc5054bfbba313b7230dcf602229dd1a

1
Desktop Interface/build_linux/libusb/libusb.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
58b406f247fe3db891496f8b1ab8227f387e545e

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-core.lo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
30e5bee43039b6eadee6d209fb76f629d017802b

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-core.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
19e308387dc1230624f93ead6c5cf9cfe3b0d36b

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-descriptor.lo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
f1cc6dc9004226e74b9d2c09c50fa1f7fcb446d0

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-descriptor.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
1e8439a484e516163a1fd16b6000d53d0d0aa700

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-io.lo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
dd09400664a0612dd822c00ca98424a2744c7e80

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-io.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
01f698c6bf227ef3ef0bd00385dcd18213588745

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-linux_usbfs.lo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
382263035b19f0b9298337497d016e26fbb09290

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-linux_usbfs.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
396f330a239ab09c4a34322dd89046ae922142e8

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-sync.lo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
84dbf59dcac0ba5d9894256df2a309db042aeb4d

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-sync.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
aa7878919f97e51b54f9823177c3da057e5d836f

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-threads_posix.lo.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
06e649cfd5f4624b1433c4c97709ac9433f72c2c

1
Desktop Interface/build_linux/libusb/libusb_1_0_la-threads_posix.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
2aa87d195a17d088af8cb60a80b56be336ca77df

1
Desktop Interface/build_linux/libusb/libusbi.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
976be0d13b6bf41a4685664563bebe5f1f7e8477

1
Desktop Interface/build_linux/libusb/os/darwin_usb.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
8834d0f958b3693c94a62a9724f76dd1a2447b1b

1
Desktop Interface/build_linux/libusb/os/darwin_usb.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
59d0a694cedea8f1d3141261312734ca2d6d9872

1
Desktop Interface/build_linux/libusb/os/linux_usbfs.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
02d182d65aa751ee55d9886a77c0f177a2e94709

1
Desktop Interface/build_linux/libusb/os/linux_usbfs.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
487acb5ac2576495930c9f8c7abb463f3d67639f

1
Desktop Interface/build_linux/libusb/os/openbsd_usb.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e31941bfecb5c9275525baea566258968d84c817

1
Desktop Interface/build_linux/libusb/os/poll_posix.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
0e5e7f5b720b112441663ee3bf9c6483689693ed

1
Desktop Interface/build_linux/libusb/os/poll_windows.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
7f4d9c4e7e94def7a91a16624d16582a9f539a94

1
Desktop Interface/build_linux/libusb/os/poll_windows.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
6e5bf2bcef40da7bb1b27bcb367436378a0f802b

1
Desktop Interface/build_linux/libusb/os/threads_posix.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
60c57cf81e63e92d1f5c252bdb18040d4e08140b

1
Desktop Interface/build_linux/libusb/os/threads_posix.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
97522089369ba69a922e6520fc5af9b697916a43

1
Desktop Interface/build_linux/libusb/os/threads_windows.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
1394bb0f80174b4b41874060190dd27a3cf8e3d2

1
Desktop Interface/build_linux/libusb/os/threads_windows.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
7bb144af584c2a66e660bf37eb0f23978086e770

1
Desktop Interface/build_linux/libusb/os/windows_usb.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
0739c1924265e0a17ef49ec1bcc48946cf935e97

1
Desktop Interface/build_linux/libusb/os/windows_usb.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
ddbd68075b97871ee0e1973d84f3a310acf54cd7

1
Desktop Interface/build_linux/libusb/sync.c.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
8eed47b68a8737ba3ffd8d8c881468521525c68d

1
Desktop Interface/build_linux/libusb/version.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
62446da871174fe85551c9d2b315a6910262c1be

1
Desktop Interface/build_linux/platformspecific.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
ef43c8ad5534f05ef012418a61c5b1b32835b216

2
Desktop Interface/build_win/platformspecific.h.REMOVED.git-id
View File

@ -1 +1 @@
734c3f02b36e8e3d8d730525b5e0636f2e4df068
a6e92d37d5eb3696db032e10dfd650d2da25af9c

1
Desktop Interface/cursorenabler.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e2fe48ac08850453c25cdeae7417188fa32924e2

1
Desktop Interface/desktop_settings.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
96b4fda23a43d5e6ab295c0eee42df8903891641

1
Desktop Interface/deviceconnecteddisplay.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
21afd3319713ec50914bbdb08d4ed88551b3a79c

1
Desktop Interface/espocombobox.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
b2a686c80a63c6a671a3df6f7109254d9426dd0e

2
Desktop Interface/esposlider.h.REMOVED.git-id
View File

@ -1 +1 @@
d2a65db667ce65538052cb6aa490c774081020be
44a21361132b4e38d45c50392bd9856af5bd5b19

1
Desktop Interface/esposlider.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
9ab10174b31e85c0cf19f4121a088ac990485cb1

1
Desktop Interface/espospinbox.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
46aca6effdc470158543685ba54c36c1f5e06818

1
Desktop Interface/functiongencontrol.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
338c99ca36756b4b8a20ff167c58553b7de75b56

1
Desktop Interface/gahnooslashlinuxusbdriver.cpp.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
991d1ebae8cebaef895ed725fee6ed163036a9ab

1
Desktop Interface/gahnooslashlinuxusbdriver.h.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
195acff766b5d12809f7973ea227ecaab5c11f7f

1
Desktop Interface/gahnooslashlinuxusbdriver.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
6ec19801f6feb0986dd4cc19d4a5ba438b8c5465

2
Desktop Interface/genericusbdriver.cpp.REMOVED.git-id
View File

@ -1 +1 @@
649a3a43f850372ad49a16b9ba684fe885661871
f805912ed5aa8c35882e49dbdfe783d0f7af1ba3

2
Desktop Interface/genericusbdriver.h.REMOVED.git-id
View File

@ -1 +1 @@
02afe4394d9c84d0b06dda057880b429aaf8aa96
5eb663ae4b8c47a1def439b58dc8b1f5e9498324

1
Desktop Interface/genericusbdriver.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
b2173b70c282eb3aa6f81698426bebaa21679748

1
Desktop Interface/isobuffer.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
cf2fc0f2191d061ecc240d8127448f4a727cf069

2
Desktop Interface/isodriver.cpp.REMOVED.git-id
View File

@ -1 +1 @@
33aecdcb25f9e1ef98bab61f2a9026edc228076d
28ae4cb6517d16967fc85977fae405b8a004365f

1
Desktop Interface/isodriver.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
b4c0ea36661de2a442fd0dc89608ba162e83cf2b

1
Desktop Interface/main.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
ad8e7af12e302a7261fd1d7e921009c38e960b93

2
Desktop Interface/mainwindow.cpp.REMOVED.git-id
View File

@ -1 +1 @@
e458001390585b6bc5b0323546d1836ca7733873
b1196ba65bca315060565fdd3bced03a9de22dae

1
Desktop Interface/mainwindow.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
b8c31a1b1ac968d12b53dbbbb8d0cf119d47baba

1
Desktop Interface/moc_buffercontrol.cpp.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
2d1541f1857014c7532f94a2c19c376623ed4543

1
Desktop Interface/moc_buffercontrol.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
ed71456810e86b8b1f1947316e3995960c25aa07

1
Desktop Interface/moc_cursorenabler.cpp.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
331d14f6675b2af268d6f6d09fccdf2fdbdf6312

1
Desktop Interface/moc_cursorenabler.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
b6d2340acc6b091a7b1f70bb7f6e6a21c769b4bf

1
Desktop Interface/moc_deviceconnecteddisplay.cpp.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
dbfc9a8c3149720f77452e697b01729221f65a72

1
Desktop Interface/moc_deviceconnecteddisplay.o.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
34aff5884638af746eaa5d50f42249cac4a38954

Some files were not shown because too many files have changed in this diff Show More