diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-28 16:48:14 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-28 16:48:14 +0200 |
| commit | 3f6185714ee9b383d9ba330e02b73017bf68babc (patch) | |
| tree | f82635745b5e14dd609bb8ed197de201f671da70 | |
| parent | 80c02173c9fc1d76ac1b404a05e2706817a4c308 (diff) | |
| parent | 9f047024326582742dc9d3d93e6f5af14b842ac9 (diff) | |
| download | otp-3f6185714ee9b383d9ba330e02b73017bf68babc.tar.gz otp-3f6185714ee9b383d9ba330e02b73017bf68babc.tar.bz2 otp-3f6185714ee9b383d9ba330e02b73017bf68babc.zip | |
Merge branch 'nox/fix-ignore/OTP-11117' into maint
* nox/fix-ignore/OTP-11117:
Properly ignore os_mon and otp_mibs generated includes
| -rw-r--r-- | .gitignore | 4 |
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 |