]> arthur.barton.de Git - netatalk.git/commitdiff
Merge branch 'v3-cleanup' into tmp/v3.0.4-alex tmp/v3.0.4-alex
authorAlexander Barton <alex@barton.de>
Sat, 20 Jul 2013 10:12:21 +0000 (12:12 +0200)
committerAlexander Barton <alex@barton.de>
Sat, 20 Jul 2013 10:12:21 +0000 (12:12 +0200)
* v3-cleanup:
  autoconf: Indentation fixes
  Spelling fixes
  Whitespace and exclamation mark fixes

Conflicts:
etc/afpd/main.c

1  2 
NEWS
etc/afpd/auth.c
etc/afpd/status.c
etc/afpd/volume.c
libatalk/cnid/cdb/cnid_cdb_close.c
libatalk/cnid/cnid.c
libatalk/cnid/dbd/cnid_dbd.c
macros/netatalk.m4
macros/quota-check.m4

diff --cc NEWS
Simple merge
diff --cc etc/afpd/auth.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge