[gnome-devel-docs: 4/4] Merge branch 'new_branch_name'

[Susanna Huhtanen <susannah src gnome org>]

commit 1387e5997cad343b88ed4fdf8a5747b0257e718d
Merge: 10af7d6 7caa6b8
Author: Susanna Huhtanen <ihmis suski gmail com>
Date:   Fri Mar 9 19:10:13 2012 +0100

    Merge branch 'new_branch_name'

 .gitignore                                         |   31 +
 NEWS                                               |   18 +
 .../accessibility-devel-guide.omf.in               |   10 -
 configure.in                                       |    2 +-
 hig/es/es.po                                       |   65 +-
 hig/hig-book.omf.in                                |   13 -
 integration-guide/integration-guide.omf.in         |   11 -
 new-platform-overview/cc-by-sa-3-0.xml             |    9 +
 new-platform-overview/concepts-boxmodel.page       |   26 +
 new-platform-overview/concepts-deployment.page     |   26 +
 new-platform-overview/concepts-gobject.page        |   24 +
 new-platform-overview/concepts-signals.page        |   22 +
 new-platform-overview/demos.page                   |   58 +
 new-platform-overview/dev-build.page               |   45 +
 new-platform-overview/dev-coding.page              |   26 +
 new-platform-overview/dev-help.page                |   34 +
 new-platform-overview/dev-translate.page           |   40 +
 new-platform-overview/equation.png                 |  Bin 0 -> 17579 bytes
 new-platform-overview/getting-ready.page           |   73 +
 new-platform-overview/index.page                   |   63 +
 new-platform-overview/overview-communication.page  |   91 +
 new-platform-overview/overview-datastorage.page    |   63 +
 new-platform-overview/overview-gettingstarted.page |   53 +
 new-platform-overview/overview-help.page           |   87 +
 new-platform-overview/overview-multimedia.page     |   63 +
 .../overview-systemintegration.page                |   64 +
 new-platform-overview/overview-ui.page             |   63 +
 new-platform-overview/samples.page                 |   33 +
 new-platform-overview/tech-atk.page                |  109 +
 new-platform-overview/tech-cairo.page              |  100 +
 new-platform-overview/tech-canberra.page           |   82 +
 new-platform-overview/tech-clutter.page            |  103 +
 new-platform-overview/tech-dbus.page               |  110 +
 new-platform-overview/tech-eds.page                |   96 +
 new-platform-overview/tech-gda.page                |   79 +
 new-platform-overview/tech-gdk.page                |  103 +
 new-platform-overview/tech-gio-network.page        |   84 +
 new-platform-overview/tech-gio.page                |   92 +
 new-platform-overview/tech-glib.page               |   69 +
 new-platform-overview/tech-gobject.page            |   69 +
 new-platform-overview/tech-gsettings.page          |   68 +
 new-platform-overview/tech-gstreamer.page          |  113 +
 new-platform-overview/tech-gtk.page                |  106 +
 new-platform-overview/tech-gupnp.page              |  142 +
 new-platform-overview/tech-keyring.page            |  116 +
 new-platform-overview/tech-notify.page             |   77 +
 new-platform-overview/tech-pango.page              |  106 +
 new-platform-overview/tech-soup.page               |   70 +
 new-platform-overview/tech-telepathy.page          |  104 +
 new-platform-overview/tech-tracker.page            |   71 +
 new-platform-overview/tech-webkit.page             |   92 +
 new-platform-overview/tech.page                    |   41 +
 new-platform-overview/test_comm1.png               |  Bin 0 -> 81184 bytes
 optimization-guide/optimization-guide.omf.in       |   11 -
 platform-demos/C/desktop.js.page                   |    8 +-
 platform-demos/C/guitar-tuner.cpp.page             |    4 +-
 platform-demos/C/guitar-tuner.vala.page            |    7 +-
 platform-demos/C/guitar-tuner/guitar-tuner.cc      |   14 +-
 platform-demos/C/image-viewer.cpp.page             |   59 +-
 platform-demos/C/image-viewer.js.page              |    2 +-
 platform-demos/C/image-viewer.vala.page            |    2 -
 platform-demos/C/image-viewer/image-viewer.cc      |   45 +-
 platform-demos/C/image-viewer/image-viewer.js      |    2 +-
 platform-demos/C/part-1.vala.page                  |   16 +-
 platform-demos/es/es.po                            | 1106 ++++--
 platform-overview/de/de.po                         | 1013 ++++--
 platform-overview/es/es.po                         | 3856 ++++++++++++++++++--
 style-guide/C/markup.page                          |   27 +
 68 files changed, 8404 insertions(+), 1083 deletions(-)
---