mirror of
https://github.com/BililiveRecorder/BililiveRecorder.git
synced 2024-11-16 11:42:22 +08:00
0dd3b84e4a
# Conflicts: # BililiveRecorder.WPF/Controls/AddRoomFailedDialog.xaml.cs # BililiveRecorder.WPF/Controls/RoomCard.xaml # BililiveRecorder.WPF/Controls/TaskbarIconControl.xaml # BililiveRecorder.WPF/Controls/TaskbarIconControl.xaml.cs # BililiveRecorder.WPF/NewMainWindow.xaml.cs # BililiveRecorder.WPF/Pages/AnnouncementPage.xaml.cs # BililiveRecorder.WPF/Pages/RootPage.xaml.cs |
||
---|---|---|
.. | ||
app.manifest | ||
AssemblyInfo.cs | ||
Resources.Designer.cs | ||
Resources.resx | ||
Strings.Designer.cs | ||
Strings.en.resx | ||
Strings.ja.resx | ||
Strings.resx | ||
Strings.zh-Hant.resx |