M-Labs
/
web-legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:m-labs/web

This commit is contained in:
Sebastien Bourdeauducq 2015-02-03 00:28:32 +08:00
parent d529e09289 afad0c6653
commit 4db0a384b4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/index.html
View File

@ -5,7 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>M-Labs &raquo; indie high-tech development</title>
<title>ARTIQ: Advanced Real Time Infrastructure for Quantum physics &raquo; M-Labs</title>
<link rel="stylesheet" type="text/css" media="screen" href="../style.css" />
<link rel="icon" type="image/png" href="../favicon.png" />
@ -136,6 +136,7 @@ class Experiment(AutoDB):
<li><a href="slides_taaccs.pdf">Slide-show</a></li>
<li><a href="manual/">Manual</a> (work in progress)</a>
<li>Commercial support available - contact sb at m-labs.hk</li>
<li>Press release: <a href="http://nist.gov/pml/div688/grp10/open-source-software-for-quantum-information.cfm">Open-Source Software for Quantum Information</a></li>
</ul></p>
</div>
</div>

5
index.html
View File

@ -35,7 +35,10 @@
<center><a href="artiq/index.html"><img src="artiq.png"></a></center>
<p>ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments, being developed in partnership with the Nobel prize-winning <a href="http://www.nist.gov/pml/div688/grp10/index.cfm">Ion Storage Group</a> at NIST.</p>
<p>The system features a high-level programming language that helps describing complex experiments, which is compiled and executed on dedicated hardware with nanosecond timing resolution and sub-microsecond latency.</p>
<p><ul><li><a href="artiq/index.html">More...</a></li></ul></p>
<p><ul>
<li>Press release: <a href="http://nist.gov/pml/div688/grp10/open-source-software-for-quantum-information.cfm">Open-Source Software for Quantum Information</a></li>
<li><a href="artiq/index.html">More...</a></li>
</ul></p>
</div>
<br />