diff options
| author | Neil Roberts <neil@linux.intel.com> | 2013-11-29 14:01:48 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-12-17 14:24:19 +0000 |
| commit | 17caccee4bcbae68a7f8b20742be54c9ac89cf75 (patch) | |
| tree | d2a621c6e339b2b9f622ac7514f5b7e5a12918bd | |
| parent | 3b75d342f344f04cf2ccd13de601469988ec88ef (diff) | |
| download | cogl-17caccee4bcbae68a7f8b20742be54c9ac89cf75.tar.gz | |
Update .gitignore
(cherry picked from commit f2072ab07566461b849f60e4e347171fcc9a9877)
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -61,6 +61,7 @@ depcomp /examples/cogl-msaa /examples/cogl-point-sprites /examples/cogl-sdl-hello +/examples/cogl-sdl2-hello /examples/cogl-x11-foreign /examples/cogl-x11-tfp /examples/cogland @@ -76,9 +77,10 @@ TAGS /tests/conform/test-launcher.sh /tests/interactive/wrapper.sh /tests/conform/*.bat -/tests/conform/config.env -/tests/micro-perf/test-journal +/tests/conform/.log +/tests/unit/.log /tests/config.env +/tests/micro-perf/test-journal /po/POTFILES /po/*.gmo /po/Makefile.in.in |