In gutils/gimagereadxbm.c, tested a few short samples, made long work too.
Merge remote-tracking branch 'upstream/master'
Merge pull request #363 from JoesCat/master

minor update
Update fontforge/pixmaps/tango/resources

Cleaned up main menu drop downs. Added subtle menu box border, to replace the 'all-white, borderless menus' look.
Fixing color change of OK/Cancel buttons by vern
Merge branch 'master' of https://github.com/fontforge/fontforge
Updates for automated build support for osx.

make sure the old zip is gone first, choose the best compression
mode (slower but smaller file) by default.
Merge pull request #366 from monkeyiq/2013feb/issue359

Updates for automated build support for osx.
Dont crash if the vendorid in a UFO is not given.

https://github.com/fontforge/fontforge/issues/360
Merge pull request #367 from monkeyiq/2013feb/issues360

Dont crash if the vendorid in a UFO is not given.
Updated to access https://github.com/fontforge/libuninameslist

Can now fetch unicode names and anotations.
Resolves issue# https://github.com/fontforge/fontforge/issues/233
The starting on a collab setup. Focus is only on collab between two
processes on a single machine at the moment. The process
fontforge-internal-collab-server must be manually started too.

Better to start and remove the rough edges later.
Fixes for MXE cross-compile
Merge pull request #371 from mpetroff/mingw32-fixes

Fixes for MXE cross-compile
Minor alignment touchup
Better structuring of the "undo/redo pair" for the client performing a
modification

In particular, the client making a modification now undoes its change,
serializes the created redo operation, removes that redo from the
stack and sends the serialized redo to the server. In turn the server
sends the serialized redo to all clients and thus the operation is
performed again.

This way, the client which performs an operation sees a much closer
picture of events to all the other clients. Less differences between
client state is a good thing.
update for mac
include the new collab server binary too
Show the user the server host name and allow the clients to specify
where to connect
In gutils/gimagewritexbm.c, explain pixel-type error to stderr