aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-03-31 15:42:04 +0200
committerRickard Green <[email protected]>2014-03-31 15:42:04 +0200
commit841ed47354afb2ac15f17e945d82e569f17ca1ae (patch)
tree9b9290f29897afaf89ad9490b1d08931ff4fad66 /.gitignore
parentb7764ebe9c9284c242774f6d076a8c6d190638fa (diff)
parentffa393096b435cde37fa1db654a012fe3175bd02 (diff)
downloadotp-841ed47354afb2ac15f17e945d82e569f17ca1ae.tar.gz
otp-841ed47354afb2ac15f17e945d82e569f17ca1ae.tar.bz2
otp-841ed47354afb2ac15f17e945d82e569f17ca1ae.zip
Merge branch 'rickard/otp_patch_apply'
* rickard/otp_patch_apply: Replace 'otp_build patch_app' with 'otp_patch_apply'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b391ecbe57..d40f49b56f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,8 @@ lib/wx/c_src/win32/
lib/wx/priv/win32/
lib/wx/win32/
make/win32/
+make/otp_built
+make/otp_doc_built
# OSE
*.d