Code

Changeset dd5e6e in vlc.mediaplayer


Ignore:
Timestamp:
08/08/2013 06:21:42 AM (7 years ago)
Author:
geos_one
Branches:
master
Children:
3a6378
Parents:
7ad983 (diff), c31691 (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.
git-author:
Mario Fetka <mario.fetka@…> (08/08/2013 06:21:42 AM)
git-committer:
Mario Fetka <mario.fetka@…> (08/08/2013 06:21:42 AM)
Message:

Merge branch 'master' of disconnected-by-peer.at:go-opsi/vlc.mediaplayer

Files:
2 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/uninstall3264.ins

    r46d4b9 rc31691  
    77requiredWinstVersion >= "4.11.2.6" 
    88 
    9 DefVar $UninstallProg32$ 
     9; DefVar $UninstallProg32$ 
    1010DefVar $UninstallProgram32$ 
    1111DefVar $UninstallProgramOld32$ 
    1212DefVar $IniFile32$ 
    13 DefVar $UninstallProg64$ 
     13; DefVar $UninstallProg64$ 
    1414DefVar $UninstallProgram64$ 
    1515DefVar $UninstallProgramOld64$ 
  • builder-product.cfg

    r5eac32 r7ad983  
    66NAME="VLC media player" 
    77DESCRIPTION="VLC is a free and open source cross-platform multimedia player and framework that plays most multimedia files as well as DVD, Audio CD, VCD, and various streaming protocols." 
    8 VERSION="2.0.7" 
     8VERSION="2.0.8" 
    99RELEASE="1" 
    1010PRIORITY="0" 
Note: See TracChangeset for help on using the changeset viewer.