Merge branch 'concurrent-cancellable'
[platform/upstream/glib.git] / gobject / gmarshal.h
2011-06-20 Colin WaltersStop using glib-genmarshal at build time