Skip to content

Commit

Permalink
merge release 0.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
tmm360 committed Oct 1, 2024
2 parents 27a66a7 + 894aa37 commit 5089865
Show file tree
Hide file tree
Showing 116 changed files with 3,801 additions and 4,339 deletions.
661 changes: 661 additions & 0 deletions COPYING

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion EthernaVideoImporter.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6647EBF4-A8E7-4987-9A43-CF6F9DA1A3AF}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
README.md = README.md
.gitignore = .gitignore
nuget.config = nuget.config
EndProjectSection
Expand All @@ -32,24 +31,33 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Debug-DevEnv|Any CPU = Debug-DevEnv|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6B534273-4C90-4EEC-A13B-ABBD9867E1D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B534273-4C90-4EEC-A13B-ABBD9867E1D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B534273-4C90-4EEC-A13B-ABBD9867E1D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B534273-4C90-4EEC-A13B-ABBD9867E1D2}.Release|Any CPU.Build.0 = Release|Any CPU
{6B534273-4C90-4EEC-A13B-ABBD9867E1D2}.Debug-DevEnv|Any CPU.ActiveCfg = Debug-DevEnv|Any CPU
{6B534273-4C90-4EEC-A13B-ABBD9867E1D2}.Debug-DevEnv|Any CPU.Build.0 = Debug-DevEnv|Any CPU
{CD81CBF2-FBFE-4BB2-A777-5F5B9EFAB80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD81CBF2-FBFE-4BB2-A777-5F5B9EFAB80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD81CBF2-FBFE-4BB2-A777-5F5B9EFAB80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD81CBF2-FBFE-4BB2-A777-5F5B9EFAB80E}.Release|Any CPU.Build.0 = Release|Any CPU
{CD81CBF2-FBFE-4BB2-A777-5F5B9EFAB80E}.Debug-DevEnv|Any CPU.ActiveCfg = Debug|Any CPU
{CD81CBF2-FBFE-4BB2-A777-5F5B9EFAB80E}.Debug-DevEnv|Any CPU.Build.0 = Debug|Any CPU
{9CBEB485-1E55-4457-B127-7E0A75602939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CBEB485-1E55-4457-B127-7E0A75602939}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CBEB485-1E55-4457-B127-7E0A75602939}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CBEB485-1E55-4457-B127-7E0A75602939}.Release|Any CPU.Build.0 = Release|Any CPU
{9CBEB485-1E55-4457-B127-7E0A75602939}.Debug-DevEnv|Any CPU.ActiveCfg = Debug-DevEnv|Any CPU
{9CBEB485-1E55-4457-B127-7E0A75602939}.Debug-DevEnv|Any CPU.Build.0 = Debug-DevEnv|Any CPU
{CBC4D9D1-6291-433F-80D7-4607D1CABC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CBC4D9D1-6291-433F-80D7-4607D1CABC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBC4D9D1-6291-433F-80D7-4607D1CABC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBC4D9D1-6291-433F-80D7-4607D1CABC48}.Release|Any CPU.Build.0 = Release|Any CPU
{CBC4D9D1-6291-433F-80D7-4607D1CABC48}.Debug-DevEnv|Any CPU.ActiveCfg = Debug|Any CPU
{CBC4D9D1-6291-433F-80D7-4607D1CABC48}.Debug-DevEnv|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
22 changes: 13 additions & 9 deletions EthernaVideoImporter.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2022-present Etherna SA
This file is part of Etherna Video Importer.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Etherna Video Importer is free software: you can redistribute it and/or modify it under the terms of the
GNU Affero General Public License as published by the Free Software Foundation,
either version 3 of the License, or (at your option) any later version.

http://www.apache.org/licenses/LICENSE-2.0
Etherna Video Importer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</s:String>
You should have received a copy of the GNU Affero General Public License along with Etherna Video Importer.
If not, see &lt;https://www.gnu.org/licenses/&gt;.</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=affero/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=blurhash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=defund/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dtos/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=etherna/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Fmpeg/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Fprobe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mantaray/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary>
201 changes: 0 additions & 201 deletions LICENSE

This file was deleted.

Loading

0 comments on commit 5089865

Please sign in to comment.