Merge branch 'master' of github.com:fmtlib/fmt

fmt/format.cc

@@ -25,8 +25,8 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "fmt/format.h"
-#include "fmt/printf.h"
+#include "format.h"
+#include "printf.h"
 
 #include <string.h>
 

fmt/ostream.cc

@@ -7,7 +7,7 @@
  For the license information refer to format.h.
  */
 
-#include "fmt/ostream.h"
+#include "ostream.h"
 
 namespace fmt {
 

fmt/ostream.h

@@ -10,7 +10,7 @@
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-#include "fmt/format.h"
+#include "format.h"
 #include <ostream>
 
 namespace fmt {

fmt/posix.cc

@@ -12,7 +12,7 @@
 # define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "fmt/posix.h"
+#include "posix.h"
 
 #include <limits.h>
 #include <sys/types.h>

fmt/posix.h

@@ -27,7 +27,7 @@
 # include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
 #endif
 
-#include "fmt/format.h"
+#include "format.h"
 
 #ifndef FMT_POSIX
 # if defined(_WIN32) && !defined(__MINGW32__)

fmt/printf.h

@@ -13,7 +13,7 @@
 #include <algorithm>  // std::fill_n
 #include <limits>     // std::numeric_limits
 
-#include "fmt/ostream.h"
+#include "ostream.h"
 
 namespace fmt {
 namespace internal {

fmt/string.h

@@ -10,7 +10,7 @@
 #ifndef FMT_STRING_H_
 #define FMT_STRING_H_
 
-#include "fmt/format.h"
+#include "format.h"
 
 namespace fmt {
 

fmt/time.h

@@ -10,7 +10,7 @@
 #ifndef FMT_TIME_H_
 #define FMT_TIME_H_
 
-#include "fmt/format.h"
+#include "format.h"
 #include <ctime>
 
 #ifdef _MSC_VER