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 |
||
---|---|---|
.. | ||
AdvancedSettingsPage.xaml | ||
AdvancedSettingsPage.xaml.cs | ||
AnnouncementPage.xaml | ||
AnnouncementPage.xaml.cs | ||
LogPage.xaml | ||
LogPage.xaml.cs | ||
RoomListPage.xaml | ||
RoomListPage.xaml.cs | ||
RootPage.xaml | ||
RootPage.xaml.cs | ||
SettingsPage.xaml | ||
SettingsPage.xaml.cs |