Changeset 18fe05b


Ignore:
Timestamp:
Apr 18, 2012 6:47:53 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
195a4e97
Parents:
49cee5b (diff), 5b5b3b2 (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 of '06b8a711c60dbb6a9d628c4c5ffd8b205176271a'

and 'c1edfeadb75181e65ad8d4c0005b861f3563dd5b'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/install.xml

    r49cee5b r18fe05b  
    133133             -->
    134134            <parsable targetfile="$INSTALL_PATH/wrapper.config" type="plain" />
    135             <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
    136             <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
     135            <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix" />
     136            <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix" />
    137137            <parsable targetfile="$INSTALL_PATH/eepget.bat" type="shell" os="windows" />
    138             <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
     138            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix" />
    139139            <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
    140140           
Note: See TracChangeset for help on using the changeset viewer.