Robert Jordens 6434a9cd5f Merge branch 'master' into subprocess-termination ... * master: (44 commits) Revert "conda: restrict binutils-or1k-linux dependency to linux." manual/installing: refresh use https for m-labs.hk gui/log: top cell alignment master/log: do not break lines conda: fix pyqt package name gui/applets: log warning if IPC address not in command applets: make sure pyqtgraph imports qt5 applets: avoid argparse subparser mess examples/histogram: artiq -> artiq.experiment gui/applets: save dock UID in state setup.py: give up trying to check for PyQt setup.py: fix PyQt5 package name Use Qt5 applets: fix error message text applets: handle dataset mutations applets: properly name docks to support state save/restore applets: clean shutdown protocols/pyon: set support protocols/pyon: remove FlatFileDB ...		2016-02-11 09:24:45 +01:00
..
logo	manual: use theme options which looks like m-labs web site	2014-12-02 10:32:27 +08:00
manual	Merge branch 'master' into subprocess-termination	2016-02-11 09:24:45 +01:00
slides	copyright: claim contributions	2015-09-06 16:08:57 -06:00