aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-28 16:48:21 +0200
committerFredrik Gustafsson <[email protected]>2013-05-28 16:48:21 +0200
commit24437e4cfd9c41905a9dbd18db3065f0c51a5a8f (patch)
treeb20288f5fcce7b715c7b45ea5fc7ea34594434eb
parent0a8624e32730bfa854253e0d57d4354e99fa1a3c (diff)
parent3f6185714ee9b383d9ba330e02b73017bf68babc (diff)
downloadotp-24437e4cfd9c41905a9dbd18db3065f0c51a5a8f.tar.gz
otp-24437e4cfd9c41905a9dbd18db3065f0c51a5a8f.tar.bz2
otp-24437e4cfd9c41905a9dbd18db3065f0c51a5a8f.zip
Merge branch 'maint'
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index a3e03dc46f..7ccedd3ff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -287,13 +287,13 @@ JAVADOC-GENERATED
# otp_mibs
-/lib/otp_mibs/include/[A-Z]*.hrl
+/lib/otp_mibs/include/OTP*.hrl
/lib/otp_mibs/mibs/v1/OTP*.mib.v1
/lib/otp_mibs/priv/mibs/OTP*.bin
# os_mon
-/lib/os_mon/include/[A-Z]*.hrl
+/lib/os_mon/include/OTP*.hrl
/lib/os_mon/mibs/v1/OTP*.mib.v1
/lib/os_mon/priv/mibs/OTP*.bin