aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-05-17 12:03:21 +0200
committerHenrik Nord <[email protected]>2011-05-17 12:03:21 +0200
commiteb99333dec62aa1e70bfd001ff1ebb4ee8819d6d (patch)
treea9a0c356bcc2d73fc6090bc49367f09d3fd60c51
parent0d2d95e4e3605d31d7032914ed623a91ef01ff25 (diff)
parent3c0fb92e8eb30fec5def79c80a4e37ee510b87c1 (diff)
downloadotp-eb99333dec62aa1e70bfd001ff1ebb4ee8819d6d.tar.gz
otp-eb99333dec62aa1e70bfd001ff1ebb4ee8819d6d.tar.bz2
otp-eb99333dec62aa1e70bfd001ff1ebb4ee8819d6d.zip
Merge branch 'ta/gitignore-xmerl_test' into dev
* ta/gitignore-xmerl_test: git ignore lib/xmerl/test/xmerl_test.erl
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b35a6c1c31..592ac6668b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -366,5 +366,6 @@ make/win32/
/lib/xmerl/src/xmerl_sax_parser_*.erl
/lib/xmerl/src/xmerl_b64Bin.erl
/lib/xmerl/src/xmerl_xpath_parse.erl
+/lib/xmerl/test/xmerl_test.erl
/lib/erl_interface/config.h.in
/lib/configure.in