[dia] (3 commits) Non-fast-forward update to branch wip/jtojnar/mac-integration

[Zander <zbrown src gnome org>]

The branch 'wip/jtojnar/mac-integration' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  f96ebb4... build: Re-add Mac GTK integration

Commits added to the branch:

  1ff0b54... build: Use proper plug-in extension on Darwin (*)
  660d336... Merge branch 'wip/jtojnar/darwin-modules' into 'master' (*)
  b6ad980... build: Re-add Mac GTK integration

(*) This commit already existed in another branch; no separate mail sent