From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Sun, 26 Jul 2015 09:48:52 +0000 (+0200)
Subject: Merge branch 'Melanosuchus/modernize' into Melanosuchus/cmake
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4ba4dcb5644fd978e30a34d2d8b4ad88296f7ad;p=xonotic%2Fnetradiant.git

Merge branch 'Melanosuchus/modernize' into Melanosuchus/cmake
---

d4ba4dcb5644fd978e30a34d2d8b4ad88296f7ad
diff --cc libs/container/hashtable.h
index 0f174d20,1deb231e..6b16bd60
--- a/libs/container/hashtable.h
+++ b/libs/container/hashtable.h
@@@ -25,10 -31,8 +31,9 @@@ template<typename Key, typename Value, 
  #include <cstddef>
  #include <algorithm>
  #include <functional>
 +#include <memory>
  #include "debugging/debugging.h"
  
- 
  namespace HashTableDetail
  {
  inline std::size_t next_power_of_two( std::size_t size ){