From 39c3678243c601181e8ce0aacbfe3acb9dca4c43 Mon Sep 17 00:00:00 2001 From: xtne6f Date: Sun, 10 Nov 2024 16:41:05 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=93=E3=81=AEFork=E3=81=AB=E3=81=A4?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=81=AE=E8=AA=AC=E6=98=8E=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/CommonResource.h | 2 +- EpgTimer/EpgTimer/AppVersion.cs | 2 +- README.md | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Common/CommonResource.h b/Common/CommonResource.h index e4823e3397..f7dc420d46 100644 --- a/Common/CommonResource.h +++ b/Common/CommonResource.h @@ -1,4 +1,4 @@ -//#define EDCB_VERSION_TAG "" +#define EDCB_VERSION_TAG "work+s-241110" // Only ASCII characters can be used here. diff --git a/EpgTimer/EpgTimer/AppVersion.cs b/EpgTimer/EpgTimer/AppVersion.cs index 814f476bb0..5ba75d7926 100644 --- a/EpgTimer/EpgTimer/AppVersion.cs +++ b/EpgTimer/EpgTimer/AppVersion.cs @@ -5,7 +5,7 @@ namespace EpgTimer public partial class App : System.Windows.Application { internal const string VERSION_TEXT = (VERSION_TAG != "" ? " " + VERSION_TAG : "") + (VERSION_EXTRA != "" ? " " + VERSION_EXTRA : ""); - const string VERSION_TAG = ""; + const string VERSION_TAG = "work+s-241110"; const string VERSION_EXTRA = ""; } } diff --git a/README.md b/README.md index b3829fd1ca..884fa8e684 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,22 @@ EpgDataCap_Bon Documents are stored in the 'Document' directory. Configuration files are stored in the 'ini' directory. + +**このフォークについて** + +人柱版10.69からの改変部分は[Document/Readme_Mod.txt](Document/Readme_Mod.txt)を参照。 +ビルド方法は[Document/HowToBuild.txt](Document/HowToBuild.txt)を参照。(自ビルド派の追加メモ[build_memo.txt](https://gist.github.com/xtne6f/f9b6f19c10cd146fe580)) +[0ac7692](https://github.com/xtne6f/EDCB/commits/0ac7692afe7cbe615534577facda15f57b5e5af9)の履歴確認のため、[コミットをバラしたタグ](https://github.com/xtne6f/EDCB/commits/log-mod4k7)を作りました。 +[01aff08](https://github.com/xtne6f/EDCB/commits/01aff08a5df4c7e63c86ea7136c20b259c08229e)にかけて改行コードの混乱があったようです。[改行のみ調整したタグ](https://github.com/xtne6f/EDCB/commits/log-to-crlf)も作りました(※改行以外の調整は一切無し)。 + +各々のコミットを大まかに理解したうえで自由にマージやcherry-pickしてください。大体[こんな方針](https://github.com/xtne6f/EDCB/pull/1)で改造しています。 +[branch:work](https://github.com/xtne6f/EDCB/tree/work)をベースに、以下をマージしたものが[branch:work-plus-s](https://github.com/xtne6f/EDCB/tree/work-plus-s)です。 + +[branch:misc](https://github.com/xtne6f/EDCB/tree/misc) +* 細かな重箱つつきのブランチ。たまに機能追加もある + +[branch:misc-ui](https://github.com/xtne6f/EDCB/tree/misc-ui) +* おもにEpgTimer(NW)のUI周辺を弄るブランチ + +[branch:edcb-plug-in](https://github.com/xtne6f/EDCB/tree/edcb-plug-in) +* EdcbPlugIn(TVTestプラグイン)のブランチ。説明は[releases](https://github.com/xtne6f/EDCB/releases)に添付