diff options
| author | Dan Gudmundsson <[email protected]> | 2010-11-26 15:10:27 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-26 15:10:27 +0100 |
| commit | 8339345b4e7e0b2f6520af9ecf512c7a8e538276 (patch) | |
| tree | 0f165c27fcd9ce0b3a367c2284ce2a992e6c2d2b /.gitignore | |
| parent | 99a28d961d2d760e98353b55991f1fc51dee06b0 (diff) | |
| parent | abc92a6f3b4615e596992eda153da0c09a3c7cbf (diff) | |
| download | otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.tar.gz otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.tar.bz2 otp-8339345b4e7e0b2f6520af9ecf512c7a8e538276.zip | |
Merge branch 'dgud/wx/separate-opengl' into dev
* dgud/wx/separate-opengl:
Fix non available opengl functions
Add lib paths for *bsd variants
Initilize opengl after setCurrent
Update to OpenGL 4.1
Remove ostype sub dirs below wx/priv
Windows and Mac build issues
Add dialyser spec
Better make dependecies for api generation
Split opengl functionality into separate dynamic library
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 6034a21f87..559d6b8898 100644 --- a/.gitignore +++ b/.gitignore @@ -286,10 +286,12 @@ a.out.dSYM/ /lib/wx/api_gen/wx_xml/* /lib/wx/api_gen/gl_xml/* /lib/wx/api_gen/??_doxygen -/lib/wx/api_gen/??xml_generated +/lib/wx/api_gen/*_generated /lib/wx/wx-*.ez /lib/wx/CONF_INFO /lib/wx/doc/src/wx*.xml +/lib/wx/priv/wxe_driver.* +/lib/wx/priv/erl_gl.* # xmerl |