diff options
| author | Chad Versace <chad.versace@intel.com> | 2015-03-23 09:21:56 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@intel.com> | 2015-03-23 09:21:56 -0700 |
| commit | 5b5b46d4b1017c8e48400a190dba7cc0fa1e862f (patch) | |
| tree | f735efe0189e5a034b16095dc384bf41ede8f89b | |
| parent | 3ddbfdb25d8cc39595cb7a2e7532a642c1c183a7 (diff) | |
| parent | 943f6404474bab87b18421d14e56763addae1cea (diff) | |
| download | waffle-5b5b46d4b1017c8e48400a190dba7cc0fa1e862f.tar.gz | |
Merge branch 'master' into next
* master:
.gitignore: Ignore all generated html manpages
| -rw-r--r-- | .gitignore | 24 |
1 files changed, 3 insertions, 21 deletions
@@ -36,27 +36,9 @@ Makefile /bin/gl_basic_test /bin/simple-x11-egl /bin/wflinfo -/doc/html/man/waffle.7.html -/doc/html/man/waffle_attrib_list.3.html -/doc/html/man/waffle_config.3.html -/doc/html/man/waffle_context.3.html -/doc/html/man/waffle_display.3.html -/doc/html/man/waffle_dl.3.html -/doc/html/man/waffle_enum.3.html -/doc/html/man/waffle_error.3.html -/doc/html/man/waffle_feature_test_macros.7.html -/doc/html/man/waffle_gbm.3.html -/doc/html/man/waffle_get_proc_address.3.html -/doc/html/man/waffle_glx.3.html -/doc/html/man/waffle_gl_misc.3.html -/doc/html/man/waffle_init.3.html -/doc/html/man/waffle_is_extension_in_string.3.html -/doc/html/man/waffle_make_current.3.html -/doc/html/man/waffle_native.3.html -/doc/html/man/waffle_wayland.3.html -/doc/html/man/waffle_window.3.html -/doc/html/man/waffle_x11_egl.3.html -/doc/html/man/wflinfo.1.html +/doc/html/man/*.1.html +/doc/html/man/*.3.html +/doc/html/man/*.7.html /examples/gl_basic /examples/simple-x11-egl /html/ |