Merged develop into NewAtmosphere branch.

2026-04-24 13:08:49 -05:00 · 2017-02-27 15:02:02 -05:00
parent 4dd076260b 6704491fdc
commit 3c4bf23317
756 changed files with 7916 additions and 4634 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 *