aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2010-08-20 17:18:42 +0200
committerRickard Green <[email protected]>2010-08-20 17:18:42 +0200
commit7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f (patch)
tree62d201d7507ca47f4ade3d10faf8e5ae8b7f4b23 /lib
parentdb6d8ec0a58316aa8fa6bf8d6a91be5996459b84 (diff)
parentd0c8b92b706ca2bebc7e12e7ce0e7244ef37a068 (diff)
downloadotp-7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f.tar.gz
otp-7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f.tar.bz2
otp-7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f.zip
Merge branch 'rickard/gitignore/R14B' into dev
* rickard/gitignore/R14B: Update gitignore
Diffstat (limited to 'lib')
-rw-r--r--lib/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/.gitignore b/lib/.gitignore
index a33916b3bf..340baf5269 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -128,6 +128,7 @@
/megaco/src/text/megaco_text_parser_v1.erl
/megaco/src/text/megaco_text_parser_v2.erl
/megaco/src/text/megaco_text_parser_v3.erl
+/megaco/doc/html/mstone1.jpg
# mnesia