Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -17,14 +17,14 @@ class wxChoice;
class PadMapDialog final : public wxDialog
{
public:
PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client);
PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client);
PadMappingArray GetModifiedPadMappings() const;
PadMappingArray GetModifiedPadMappings() const;
private:
void OnAdjust(wxCommandEvent& event);
void OnAdjust(wxCommandEvent& event);
wxChoice* m_map_cbox[4];
PadMappingArray m_pad_mapping;
std::vector<const Player*> m_player_list;
wxChoice* m_map_cbox[4];
PadMappingArray m_pad_mapping;
std::vector<const Player*> m_player_list;
};