aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2009-12-15 15:22:44 +0100
committerErlang/OTP <[email protected]>2009-12-15 15:22:44 +0100
commita0c385e10b16c7697ad744bc63d7ce4d0439ca6e (patch)
tree8e8598741f745ecb157d4c57d8a415a09f696ff2
parent90cb735f9be9a50787ce243f538ae736eab552a4 (diff)
parent92f7d0be6031b5a37d27dc8bd479437df84b63d7 (diff)
downloadotp-a0c385e10b16c7697ad744bc63d7ce4d0439ca6e.tar.gz
otp-a0c385e10b16c7697ad744bc63d7ce4d0439ca6e.tar.bz2
otp-a0c385e10b16c7697ad744bc63d7ce4d0439ca6e.zip
Merge branch 'dgud/gitignore' into ccase/r13b04_dev
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f0636f38ef..06d7e3a124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,6 +159,11 @@ autom4te.cache
# wx
/lib/wx/c_src/Makefile
/lib/wx/config.mk
+/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/wx-*.ez
# xmerl