[Checkins] [zopefoundation/zodbpickle] c20a48: Ignore emacs's .dir-locals.el

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/zodbpickle
  Commit: c20a48ce1134ee2f8f8f26dfdc45dde4c26a4acf
      https://github.com/zopefoundation/zodbpickle/commit/c20a48ce1134ee2f8f8f26dfdc45dde4c26a4acf
  Author: Jason Madden <jamadden at gmail.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Ignore emacs's .dir-locals.el


  Commit: 4bd8b8c58a6ea4b4bbada092556fd668a22f3826
      https://github.com/zopefoundation/zodbpickle/commit/4bd8b8c58a6ea4b4bbada092556fd668a22f3826
  Author: Jason Madden <jamadden at gmail.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M CHANGES.rst
    M setup.py
    M src/zodbpickle/_pickle_27.c
    M src/zodbpickle/_pickle_32.c
    M src/zodbpickle/_pickle_33.c
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/pickle_3.py
    M src/zodbpickle/tests/pickletester_2.py
    M src/zodbpickle/tests/pickletester_3.py

  Log Message:
  -----------
  Restore the noload behaviour from Python 2.6. Close zopefoundation/zodbpickle#9


  Commit: 578ac70d7f95cddafa93a6441f0f70c4c6e440c1
      https://github.com/zopefoundation/zodbpickle/commit/578ac70d7f95cddafa93a6441f0f70c4c6e440c1
  Author: Jason Madden <jamadden at gmail.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M src/zodbpickle/tests/pickletester_2.py

  Log Message:
  -----------
  Fix test under py26


  Commit: d0d37e130e27236b8da458ee5697071d673f5b0e
      https://github.com/zopefoundation/zodbpickle/commit/d0d37e130e27236b8da458ee5697071d673f5b0e
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M CHANGES.rst
    M setup.py

  Log Message:
  -----------
  Point to next release.

Bump first-dot version for new supported platforms.


  Commit: 6619c234b29cd72ef297b1faf760979805bd21c9
      https://github.com/zopefoundation/zodbpickle/commit/6619c234b29cd72ef297b1faf760979805bd21c9
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M .gitignore
    M CHANGES.rst
    M setup.py
    M src/zodbpickle/_pickle_27.c
    M src/zodbpickle/_pickle_32.c
    M src/zodbpickle/_pickle_33.c
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/pickle_3.py
    M src/zodbpickle/tests/pickletester_2.py
    M src/zodbpickle/tests/pickletester_3.py

  Log Message:
  -----------
  Merge branch 'noload' of git://github.com/NextThought/zodbpickle into NextThought-noload

Conflicts:
	CHANGES.rst
	setup.py
	src/zodbpickle/tests/pickletester_2.py


  Commit: c7a2c2eb27d67ec8a56232a0c7dda181e203e4ea
      https://github.com/zopefoundation/zodbpickle/commit/c7a2c2eb27d67ec8a56232a0c7dda181e203e4ea
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M .gitignore
    M CHANGES.rst
    M setup.py
    M src/zodbpickle/_pickle_27.c
    M src/zodbpickle/_pickle_32.c
    M src/zodbpickle/_pickle_33.c
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/pickle_3.py
    M src/zodbpickle/tests/pickletester_2.py
    M src/zodbpickle/tests/pickletester_3.py

  Log Message:
  -----------
  Merge branch 'NextThought-noload'


Compare: https://github.com/zopefoundation/zodbpickle/compare/4dd069732d5d...c7a2c2eb27d6