Ignore:
Timestamp:
02/24/14 03:13:27 (8 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master
Children:
e85c5b0
Parents:
5420592 (diff), 362bcc6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ssh://puzzlebox.info/repo/orbit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/PuzzleboxOrbit-install.nsi

    r5420592 r1b1f11f  
    4747 File dist\orbit-gui.exe 
    4848 File dist\phonon4.dll 
    49 # File dist\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
     49 File dist\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
    5050 File dist\pyside-python2.7.dll 
    5151 File dist\PySide.QtCore.pyd 
     
    13841384 Delete $INSTDIR\orbit-gui.exe 
    13851385 Delete $INSTDIR\phonon4.dll 
    1386 # Delete $INSTDIR\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
     1386 Delete $INSTDIR\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
    13871387 Delete $INSTDIR\pyside-python2.7.dll 
    13881388 Delete $INSTDIR\PySide.QtCore.pyd 
Note: See TracChangeset for help on using the changeset viewer.