diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
| commit | 77426493dc04593cc00c166e6fb17dd5fc985255 (patch) | |
| tree | 868060b6e16d4e9f6a347202ac1ba9c78761f404 /lib/wx/.gitignore | |
| parent | 6510ee4abddbecf10b41d0474a35af1e780ea5be (diff) | |
| parent | 6628dbe4ba097a5abed4ca7439a5b515adb0f556 (diff) | |
| download | otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.gz otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.bz2 otp-77426493dc04593cc00c166e6fb17dd5fc985255.zip | |
Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
[wx] Add simple taskbaricon test
[wx] Add missing stc function
[wx] Add wxTaskBarIcon class
[wx] Doc overloaded functions
[wx] Fix spec errors
[wx] Fix api bugs in wxDC
[wx] Fix wxGraphicContext bugs
[wx] Remove redundant erts version check
[wx] Generated types for all wx classes
[wx] Generate GL api from latest version
[wx] Cleanup Makefiles
Diffstat (limited to 'lib/wx/.gitignore')
| -rw-r--r-- | lib/wx/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/wx/.gitignore b/lib/wx/.gitignore index fd76f078d7..0fa427bfe5 100644 --- a/lib/wx/.gitignore +++ b/lib/wx/.gitignore @@ -1,2 +1,4 @@ test_log_* wx_test_case_info +api_gen/gl_man? +doc/html/*
\ No newline at end of file |