Sebastien Bourdeauducq 4db0a384b4 Merge branch 'master' of github.com:m-labs/web		2015-02-03 00:28:32 +08:00
..
comp.png	add ARTIQ page	2015-01-16 19:23:15 +08:00
forkme_right_white_ffffff.png	add ARTIQ page	2015-01-16 19:23:15 +08:00
gui_mockups_20150201.pdf	add ARTIQ GUI mockups	2015-02-03 00:28:01 +08:00
index.html	update ARTIQ web page title	2015-01-31 16:11:05 +08:00
ion_trap.png	add ARTIQ page	2015-01-16 19:23:15 +08:00
lab_hardware.png	add ARTIQ page	2015-01-16 19:23:15 +08:00
logo_small.png	add ARTIQ page	2015-01-16 19:23:15 +08:00
slides_taaccs.pdf	artiq/slides_taaccs: better pic	2014-12-19 15:30:43 +08:00