[gtk+/quartz-integration: 9/9] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit ab5b13cd6df9755237808760a0d893f3fdaf9b6c
Merge: 8eec4df 2c192cf
Author: John Ralls <jralls ceridwen us>
Date:   Thu May 26 23:21:20 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                               |    1 +
 examples/arrow/Makefile                    |   14 -
 examples/arrow/arrow.c                     |   72 ---
 examples/aspectframe/Makefile              |   14 -
 examples/aspectframe/aspectframe.c         |   42 --
 examples/base/Makefile                     |   14 -
 examples/base/base.c                       |   17 -
 examples/buttonbox/Makefile                |   14 -
 examples/buttonbox/buttonbox.c             |  119 -----
 examples/buttons/Makefile                  |   14 -
 examples/buttons/buttons.c                 |   92 ----
 examples/buttons/info.xpm                  |   92 ----
 examples/calendar/Makefile                 |   13 -
 examples/calendar/calendar.c               |  413 -----------------
 examples/colorsel/Makefile                 |   14 -
 examples/colorsel/colorsel.c               |  132 ------
 examples/entry/Makefile                    |   14 -
 examples/entry/entry.c                     |  100 ----
 examples/eventbox/Makefile                 |   14 -
 examples/eventbox/eventbox.c               |   53 ---
 examples/fixed/Makefile                    |   14 -
 examples/fixed/fixed.c                     |   72 ---
 examples/frame/Makefile                    |   14 -
 examples/frame/frame.c                     |   48 --
 examples/gdk/composited-window-example.c   |  137 ------
 examples/gtkdial/Makefile                  |   20 -
 examples/gtkdial/dial_test.c               |   68 ---
 examples/gtkdial/gtkdial.c                 |  675 ----------------------------
 examples/gtkdial/gtkdial.h                 |   89 ----
 examples/helloworld/Makefile               |   14 -
 examples/helloworld/helloworld.c           |   99 ----
 examples/helloworld2/Makefile              |   14 -
 examples/helloworld2/helloworld2.c         |   94 ----
 examples/label/Makefile                    |   14 -
 examples/label/label.c                     |  100 ----
 examples/menu/Makefile                     |   15 -
 examples/menu/menu.c                       |  134 ------
 examples/notebook/Makefile                 |   14 -
 examples/notebook/notebook.c               |  175 -------
 examples/packbox/Makefile                  |   14 -
 examples/packbox/packbox.c                 |  291 ------------
 examples/paned/Makefile                    |   14 -
 examples/paned/paned.c                     |  137 ------
 examples/progressbar/Makefile              |   14 -
 examples/progressbar/progressbar.c         |  198 --------
 examples/radiobuttons/Makefile             |   14 -
 examples/radiobuttons/radiobuttons.c       |   80 ----
 examples/rangewidgets/Makefile             |   13 -
 examples/rangewidgets/rangewidgets.c       |  293 ------------
 examples/rulers/Makefile                   |   14 -
 examples/rulers/rulers.c                   |   77 ----
 examples/scribble-simple/Makefile          |   14 -
 examples/scribble-simple/scribble-simple.c |  181 --------
 examples/scribble-xinput/Makefile          |   13 -
 examples/scribble-xinput/scribble-xinput.c |  253 -----------
 examples/scrolledwin/Makefile              |   14 -
 examples/scrolledwin/scrolledwin.c         |   93 ----
 examples/selection/Makefile                |   19 -
 examples/selection/gettargets.c            |   97 ----
 examples/selection/setselection.c          |  111 -----
 examples/spinbutton/Makefile               |   14 -
 examples/spinbutton/spinbutton.c           |  217 ---------
 examples/statusbar/Makefile                |   14 -
 examples/statusbar/statusbar.c             |   74 ---
 examples/table/Makefile                    |   14 -
 examples/table/table.c                     |   97 ----
 examples/tictactoe/Makefile                |   20 -
 examples/tictactoe/tictactoe.c             |  158 -------
 examples/tictactoe/tictactoe.h             |   61 ---
 examples/tictactoe/ttt_test.c              |   45 --
 examples/wheelbarrow/Makefile              |   14 -
 examples/wheelbarrow/wheelbarrow.c         |  173 -------
 72 files changed, 1 insertions(+), 5922 deletions(-)
---