Show
Ignore:
Timestamp:
05/22/08 16:45:06 (6 months ago)
Author:
astrange
Message:

Merge trunk to 1.1 branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/perian-1.1

    • Property svn:externals changed from
      ffmpeg -r11099 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r1297 http://svn.matroska.org/svn/matroska/trunk/libebml
      libmatroska -r1297 http://svn.matroska.org/svn/matroska/trunk/libmatroska
      a52codec -r61 http://svn.cod3r.com/a52codec/trunk
      to
      ffmpeg -r 13239 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk
  • branches/perian-1.1/Plists/Perian-Info.plist

    r800 r887  
    88        <string>Perian</string> 
    99        <key>CFBundleGetInfoString</key> 
    10         <string>1.1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2007 The Perian Team</string> 
     10        <string>1.1.1b1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2007 The Perian Team</string> 
    1111        <key>CFBundleIdentifier</key> 
    1212        <string>org.perian.Perian</string> 
     
    1616        <string>BNDL</string> 
    1717        <key>CFBundleShortVersionString</key> 
    18         <string>1.1</string> 
     18        <string>1.1.1b1</string> 
    1919        <key>CFBundleSignature</key> 
    2020        <string>????</string> 
    2121        <key>CFBundleVersion</key> 
    22         <string>1.1</string> 
     22        <string>1.1.1b1</string> 
    2323        <key>CSResourcesFileMapped</key> 
    2424        <string>yes</string> 
  • branches/perian-1.1/Plists/PerianPane-Info.plist

    r800 r887  
    3333        <string>????</string> 
    3434        <key>CFBundleVersion</key> 
    35         <string>1.1</string> 
     35        <string>1.1.1b1</string> 
    3636        <key>CFBundleName</key> 
    3737        <string>Perian</string> 
  • branches/perian-1.1/Plists/PerianUpdateChecker-Info.plist

    r800 r887  
    1818        <string>????</string> 
    1919        <key>CFBundleVersion</key> 
    20         <string>1.1</string> 
     20        <string>1.1.1b1</string> 
    2121        <key>NSMainNibFile</key> 
    2222        <string>UpdateCheckerMainMenu</string>