Merge branch 'master' into xirvik

2026-08-14 14:12:31 +00:00 · 2012-05-01 00:56:52 +09:00
parent 75933db69b f1ece0ae12
commit 6d61cc09c3
2 changed files with 11 additions and 2 deletions
@@ -94,7 +94,6 @@ public:
  core::ViewManager*  view_manager()                { return m_viewManager; }
  core::DhtManager*   dht_manager()                 { return m_dhtManager; }

-
  ui::Root*           ui()                          { return m_ui; }
  display::Manager*   display()                     { return m_display; }
  input::Manager*     input()                       { return m_input; }