Skip to content

Commit

Permalink
Merge branch 'master' into oculus-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Feb 11, 2014
2 parents 846c953 + 7b364bd commit 2ec0699
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion doomsday/libgui/include/de/gui/persistentcanvaswindow.h
Expand Up @@ -2,7 +2,6 @@
*
* @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
* @authors Copyright © 2008 Jamie Jones <jamie_jones_au@yahoo.com.au>
*
* @par License
* GPL: http://www.gnu.org/licenses/gpl.html
Expand Down
1 change: 0 additions & 1 deletion doomsday/libgui/src/persistentcanvaswindow.cpp
Expand Up @@ -7,7 +7,6 @@
*
* @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
* @authors Copyright © 2008 Jamie Jones <jamie_jones_au@yahoo.com.au>
*
* @par License
* GPL: http://www.gnu.org/licenses/gpl.html
Expand Down

0 comments on commit 2ec0699

Please sign in to comment.