diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-05-20 16:49:22 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-05-20 16:49:22 +0100 |
| commit | b9cde2c6f41cfe456b7cfb0e4d798e71667dd3a5 (patch) | |
| tree | 21e70a88cbb93557699b4d71b0830dd10ee89f6b /gl/cogl.c | |
| parent | 8eb66da6b0fbb022028d012a428a399892a0c0f3 (diff) | |
| parent | 320bcd9230992567c3e5c569277099d9c10e6594 (diff) | |
| download | cogl-b9cde2c6f41cfe456b7cfb0e4d798e71667dd3a5.tar.gz | |
Merge commit 'origin/master' into 1.0-integration
Conflicts:
clutter/clutter-texture.c
clutter/cogl/gl/cogl-fbo.c
Diffstat (limited to 'gl/cogl.c')
| -rw-r--r-- | gl/cogl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,9 +1,9 @@ /* * Cogl * - * A basic GL/GLES Abstraction/Utility Layer + * An object oriented GL/GLES Abstraction/Utility Layer * - * Copyright (C) 2007,2008,2009 OpenedHand + * Copyright (C) 2007,2008,2009 Intel Corporation. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public |