« Previous | Next » 

Revision 11f53fdb

ID11f53fdb2fc7108f6044291d9d4cf573cebfaaf8
Parent 19e21a6c, 48e3db76
Child 1eaddbc6

Added by Michael Hanselmann over 11 years ago

Merge branch 'devel-2.6'

  • devel-2.6:
    ensure-dirs: Fix permissions on master socket
    Update security document for version 2.6
    Update NEWS and bump version to 2.6.1
    Text.hs: update field lists in parseData comments

Conflicts:
NEWS: Trivial
lib/tools/ensure_dirs.py: constant moved to pathutils

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Guido Trotter <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted