Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
5d488bbcd2
27 files changed
+81
-54
No files matched your search
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2008-2014 Seth J. Morabito <sethm@loomcom.com>
|
||||
* Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
|
||||
* Maik Merten <maikmerten@googlemail.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
|
||||
Reference in new issue
Block a user