Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian:
  Add Superlab.

Conflicts:
	survey/survey.rst  -- cogent vs superlab

diff --git a/survey/survey.rst b/survey/survey.rst
index 65c322e7568157065529ca392c2c8bb416cc68d4..7010956a8c60c63a6d69586b42b5ee3477aeecbd 100644 (file)
--- a/survey/survey.rst
+++ b/survey/survey.rst
@@ -939,19 +939,20 @@ Psychophysics/Experiment control
 .. raw:: html
 
    <table class="questionaire"><tr>
+   <td class="response"><input type="checkbox" name="sw_psychphys" value="cogent" />Cogent</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="dmdx" />DMDX</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="eprime" />E-Prime</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="opensesame" />OpenSesame</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="presentation" />Presentation</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="psychopy" />PsychoPy</td>
-   <td class="response"><input type="checkbox" name="sw_psychphys" value="pyepl" />PyEPL</td>
-   </tr><tr class="oddrow">
    <td class="response"><input type="checkbox" name="sw_psychphys" value="psychtoolbox" />Psychtoolbox</td>
-   <td class="response"><input type="checkbox" name="sw_psychphys" value="psytoolkit" />Psytoolkit</td>
+   </tr><tr class="oddrow">
    <td class="response"><input type="checkbox" name="sw_psychphys" value="psyscope" />PsyScope</td>
+   <td class="response"><input type="checkbox" name="sw_psychphys" value="psytoolkit" />Psytoolkit</td>
+   <td class="response"><input type="checkbox" name="sw_psychphys" value="pyepl" />PyEPL</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="superlab" />SuperLab</td>
-   <td class="response"><input type="checkbox" name="sw_psychphys" value="visionegg" />VisionEgg</td>
    <td class="response"><input type="checkbox" name="sw_psychphys" value="tscope" />Tscope</td>
+   <td class="response"><input type="checkbox" name="sw_psychphys" value="visionegg" />VisionEgg</td>
    </tr></table>
 
 Other