Complete the switch to gnulib instead of plibc for inet_ntop
Use gnulib inet_ntop
Fix naming conflict with Windows function PrintDlg

Conflicts:
	gtkui/fontview.c
	gtkui/viewsgtk.h
Remove string "fontview," from family name list
Fixed spelling error.
osx: ok so now my Qt is under /opt/local and I've weeded out
    a few of the pesky references to Qt to point into the bundle
    where they should be.
osx: fix for dangling absolute softlink for even.
uiinterface.h: fix a comment typo
scripting.c: fix typos in argument number checks
Use gnulib's getline module for platforms lacking getline

Conflicts:
	fontforge/scripting.c
Fix a typo: Catagorize → Categorize

Conflicts:
	fontforge/parsettf.c
	fontforge/psread.c
	fontforge/splinestroke.c
	fontforge/splineutil2.c
	fontforge/ttfspecial.c
collabwebview/Makefile.am: install non-executable files without executable permission
Make libxml mandatory

This hard dependency rrthomas introduced does make sense, too many
functionalities would be lost otherwise.
Remove traces of Freetype being optional and mmap being required for it

Conflicts:
	fontforge/fffreetype.h
	fontforge/freetype.c
	gtkui/startgtk.c
Require freetype >= 2.3.7

Conflicts:
	configure.ac
	fontforge/fffreetype.h
Remove Caps-as-Alt setting: this is for desktops to do, not apps

(Another good point rrthomas stated)
Conflicts:
	configure.ac
Remove undocumented support for selecting UFO v1 output at build time
scripting.c: add some missing initializers
Always use double, not float, for real type

Conflicts:
	configure.ac
	fontforgeexe/startnoui.c
	fontforgeexe/startui.c
	m4/fontforge_arg_enable.m4
threaddummy.c is entirely useless now