Merge branch 'develop'

2014-06-10 17:43:43 +02:00 · 2014-06-10 17:43:43 +02:00 · e142134158
commit e142134158
parent 32dcafec6f e54cd0a4ed
2 changed files with 2 additions and 2 deletions
--- a/meta/libraries.json
+++ b/meta/libraries.json
@ -4,7 +4,7 @@
    "name": "Chrono",
    "authors": [
      "Howard Hinnant",
-      "Beman Dawes"
+      "Beman Dawes",
      "Vicente J. Botet Escriba"
    ],
    "maintainers": [
@ -32,5 +32,5 @@
    "category": [
      "Domain"
    ]
-  },
+  }
 ]
--- a/stopwatches/include/boost/chrono/stopwatches.hpp
+++ b/stopwatches/include/boost/chrono/stopwatches.hpp