Skip to content

A
AIDA-2020 TLU - Gateware
Switch branch/tag
History Find file
  • David Cussans's avatar
    Merge branch 'dcussans/change_permissions' into HEAD · e9f5032b
    David Cussans authored 
    Large number of conflicts reports - but almost all of these seem to have been white-space only

README.md conflict probably not resolved correctly.

Tidying up some files. This seems to have resulted in conflict with master, but I don't know how.
    e9f5032b
Name
Last commit
 Last update
..
20170315_121610.jpg Loading commit data...
20170315_121623.jpg Loading commit data...
20170315_121629.jpg Loading commit data...
20170315_123824.jpg Loading commit data...
20170315_125122.jpg Loading commit data...
AddMemory.png Loading commit data...
Initial.png Loading commit data...
LVDS_transceiver.pdf Loading commit data...
LVDS_transceiver.pptx Loading commit data...
PM3.jpg Loading commit data...
RunControlGUI.jpg Loading commit data...
TLU_19rack.pdf Loading commit data...
TLU_front_back.pdf Loading commit data...
TLU_plate.jpg Loading commit data...
Trigger0x00000002.png Loading commit data...
Trigger0x00020000.png Loading commit data...
Trigger0x00020002.png Loading commit data...
View1.png Loading commit data...
View2.png Loading commit data...
View3.png Loading commit data...
View4.png Loading commit data...
View5.png Loading commit data...
View6.png Loading commit data...
Warning.png Loading commit data...
XilinxCable.jpg Loading commit data...
backPaneldoc.pdf Loading commit data...
fifo_words.pdf Loading commit data...
fifo_words.svg Loading commit data...
frontPanel.pdf Loading commit data...
frontpanel.jpg Loading commit data...
hw_open.jpg Loading commit data...
hw_prog.png Loading commit data...
tlu_trigger_logic.pdf Loading commit data...
tlu_trigger_logic.png Loading commit data...
tlu_trigger_logic.svg Loading commit data...
tlu_trigger_logic2.pdf Loading commit data...
tlu_trigger_logic2.pdf_tex Loading commit data...