Skip to content

Commit

Permalink
Merge branch 'beta' of github.com:ggarra13/mrv2 into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Sep 11, 2024
2 parents cb07a56 + d84db2b commit 0358c3a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/full_macos14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,15 @@ jobs:
- name: Get machine name
run: |
echo "Machine name: $RUNNER_NAME"
- name: Check hdiutil
run: |
hdiutil info
hdiutil create -size 10m -fs HFS+ -volname test_disk test.dmg
hdiutil attach test.dmg
hdiutil detach /Volumes/test_disk
rm test.dmg
- name: Install ninja-build
run: brew install ninja

Expand Down
8 changes: 0 additions & 8 deletions cmake/functions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,6 @@ function(install_library_with_deps LIBRARY)
FOLLOW_SYMLINK_CHAIN
FILES "${LIBRARY}"
)
file(GET_RUNTIME_DEPENDENCIES
LIBRARIES ${LIBRARY}
RESOLVED_DEPENDENCIES_VAR RESOLVED_DEPS
UNRESOLVED_DEPENDENCIES_VAR UNRESOLVED_DEPS
)
foreach(FILE ${UNRESOLVED_DEPS})
message(NOTICE "UNRESOLVED DEPENDENCIES from ${LIBRARY}: ${FILE}")
endforeach()
endfunction()

#
Expand Down
4 changes: 3 additions & 1 deletion src/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ v1.2.7
- Fixed Menu Entry "Playback/Go to/Start" and "Playback/Go to/End" not showing
their keyboard shortcuts.
- Fixed Darby's DPX reading code.
- Allowed saving comparisons (Tiles, for example) to a movie file.
- Fixed dockgroup not getting highlited when dragging and the panel could dock.
- Allowed saving comparisons (Tiles, for example) to a movie file if Save
Annotations is turned on.
- Improved dramatically the speed of packaging mrv2 on Linux and macOS.


v1.2.6
Expand Down
4 changes: 2 additions & 2 deletions src/po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -918,8 +918,8 @@ msgid ""
"duration of 10.\n"
msgstr ""
"\n"
"Erstellt einen :class:`~TimeRange` aus Start- und End-:class:"
"`~RationalTime`\\s (inklusive).\n"
"Erstellt einen :class:`~TimeRange` aus Start- und End-:class:`~RationalTime`"
"\\s (inklusive).\n"
"\n"
"Beispiel: Wenn start_time 1 ist und end_time 10, hat der Rückgabewert eine "
"Dauer von 10.\n"
Expand Down
8 changes: 4 additions & 4 deletions src/po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -925,8 +925,8 @@ msgid ""
"duration of 9.\n"
msgstr ""
"\n"
"Crea un :class:`~TimeRange` dall'inizio e dalla fine :class:"
"`~RationalTime`\\s (esclusivo).\n"
"Crea un :class:`~TimeRange` dall'inizio e dalla fine :class:`~RationalTime`"
"\\s (esclusivo).\n"
"\n"
"Per esempio, se start_time è 1 e end_time è 10, il ritorno avrà una durata "
"di 9.\n"
Expand All @@ -940,8 +940,8 @@ msgid ""
"duration of 10.\n"
msgstr ""
"\n"
"Crea un :class:`~TimeRange` dall'inizio e dalla fine :class:"
"`~RationalTime`\\s (incluso).\n"
"Crea un :class:`~TimeRange` dall'inizio e dalla fine :class:`~RationalTime`"
"\\s (incluso).\n"
"\n"
"Per esempio, se start_time è 1 e end_time è 10, il ritorno avrà una durata "
"di 10.\n"
Expand Down

0 comments on commit 0358c3a

Please sign in to comment.