diff options
| author | Sverker Eriksson <[email protected]> | 2011-03-10 17:33:06 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-03-10 17:33:06 +0100 |
| commit | df454656f37296a47834ba8b01ec54f3638addba (patch) | |
| tree | 8af160767fa201081aa5f6d5f3209617078af180 /.gitignore | |
| parent | 82106ef01f26a1d1a862b7f57fc580cbe46428b2 (diff) | |
| parent | 5cddff325916c16487c0be91019ab737b3cfae3d (diff) | |
| download | otp-df454656f37296a47834ba8b01ec54f3638addba.tar.gz otp-df454656f37296a47834ba8b01ec54f3638addba.tar.bz2 otp-df454656f37296a47834ba8b01ec54f3638addba.zip | |
Merge branch 'pg/fix-hibernate-with-hipe' into dev
* pg/fix-hibernate-with-hipe:
Update copyright years
Fix NULL-free bug in hibernate on debug emulator
Fix several bugs related to hibernate/3 and HiPE
Conflicts:
erts/emulator/test/hibernate_SUITE.erl
OTP-9125
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0bd5e1ff2c..409be555fb 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,7 @@ make/win32/ /lib/*/test/*_SUITE_make.erl /lib/*/test/*_SUITE_data/Makefile /erts/emulator/test/*_SUITE_make.erl +/erts/emulator/test/*_native_SUITE.erl /erts/emulator/test/*_SUITE_data/Makefile /erts/test/install_SUITE_data/install_bin /erts/test/autoimport_SUITE_data/erlang.xml |