diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
| commit | a27ca45b676116ebbce31973bc1a319cad76ffbf (patch) | |
| tree | 098711ced704936739bc91abbd75942a815d89db /mesalib/src/glsl/ralloc.h | |
| parent | 0b89941658d6117d17555ee28c6e5d7715673705 (diff) | |
| parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
| download | vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.gz vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.bz2 vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
Diffstat (limited to 'mesalib/src/glsl/ralloc.h')
| -rw-r--r-- | mesalib/src/glsl/ralloc.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ralloc.h b/mesalib/src/glsl/ralloc.h index 4581a7a4e..1fe53573f 100644 --- a/mesalib/src/glsl/ralloc.h +++ b/mesalib/src/glsl/ralloc.h @@ -38,10 +38,9 @@ * Tridgell's talloc, but ralloc is an independent implementation * released under the MIT license and tuned for Mesa. * - * The talloc implementation is available under the GNU Lesser - * General Public License (GNU LGPL), version 3 or later. It is - * more sophisticated than ralloc in that it includes reference - * counting and debugging features. See: http://talloc.samba.org/ + * talloc is more sophisticated than ralloc in that it includes reference + * counting and useful debugging features. However, it is released under + * a non-permissive open source license. */ #ifndef RALLOC_H |