Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Torann
Torann committed Nov 10, 2016
2 parents deb55af + d760ae5 commit 8d2bf19
Show file tree
Hide file tree
Showing 26 changed files with 498 additions and 1,698 deletions.
2 changes: 1 addition & 1 deletion LICENCE
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The BSD 2-Clause License
Copyright (c) 2015, Daniel Stainback
Copyright (c) 2014-2016, Daniel Stainback
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
Loading

0 comments on commit 8d2bf19

Please sign in to comment.