Ignore:
Timestamp:
11/29/2023 08:46:34 AM (6 months ago)
Author:
Ken Moffat <ken@…>
Branches:
12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, trunk, xry111/llvm18
Children:
9c1319c
Parents:
f57d8fc (diff), 1b9bf3e (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 'trunk' into ken/tuningfonts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • multimedia/videoutils/ffmpeg.xml

    rf57d8fc r3a579120  
    150150      <ulink url="https://www.twolame.org/">TwoLAME</ulink>,
    151151      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
    152       <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>, and
     152      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>,
     153      <ulink url="https://vulkan.org/">Vulkan</ulink>, and
    153154      <ulink url="https://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>
    154155    </para>
Note: See TracChangeset for help on using the changeset viewer.