Merged master into NewAtmosphere.

2026-05-07 03:49:43 -05:00 · 2017-07-21 15:02:24 -04:00
parent bf9c3a6bd4 3c213fae1e
commit 20003d5b32
710 changed files with 4734 additions and 5366 deletions
@@ -2,7 +2,7 @@
 *                                                                                       *
 * OpenSpace                                                                             *
 *                                                                                       *
- * Copyright (c) 2014 - 2016                                                             *
+ * Copyright (c) 2014 - 2017                                                             *
 *                                                                                       *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
 * software and associated documentation files (the "Software"), to deal in the Software *