diff options
| author | Sven Gothel <[email protected]> | 2021-04-20 07:55:24 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2021-04-20 07:55:24 +0200 |
| commit | ef87c89f70c73928117c833e70855734be3b43e1 (patch) | |
| tree | f3026afc224e04d7ea659a40b80086bc7236a9ec /win/C#/frmMain.resx | |
| parent | f0735c10b1ecf7b12c5e13f74bba5521e11fd8c0 (diff) | |
| parent | 39e56516063cf63b0599bb7a35fe6ec69556e994 (diff) | |
Merge branch 'hw-encoder-nvenc' into hw-encoder-jointhw-encoder-joint
Diffstat (limited to 'win/C#/frmMain.resx')
0 files changed, 0 insertions, 0 deletions