[gtk+/wip/gbsneto/placessidebar-locations: 36/36] Merge branch 'master' into wip/gbsneto/placessidebar-locations



commit a25e75a4ca770883924b65642b8849cd5d05487b
Merge: b339295 f5b245f
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat May 30 12:08:28 2015 -0300

    Merge branch 'master' into wip/gbsneto/placessidebar-locations

 NEWS                                    |  106 +
 build/win32/vs10/gdk.vcxprojin          |   10 +-
 build/win32/vs9/gdk.vcprojin            |   10 +-
 configure.ac                            |    4 +-
 examples/application1/Makefile.example  |    6 +-
 examples/application10/Makefile.example |   17 +-
 examples/application2/Makefile.example  |   15 +-
 examples/application3/Makefile.example  |   15 +-
 examples/application4/Makefile.example  |   15 +-
 examples/application5/Makefile.example  |   17 +-
 examples/application6/Makefile.example  |   17 +-
 examples/application7/Makefile.example  |   17 +-
 examples/application8/Makefile.example  |   17 +-
 examples/application9/Makefile.example  |   17 +-
 gtk/Makefile.am                         |    2 +-
 gtk/gtkcssmatcher.c                     |   68 +-
 gtk/gtkcssnode.c                        |   31 +-
 gtk/gtkcssnodeprivate.h                 |    1 -
 gtk/gtkentry.c                          |   48 +-
 gtk/gtkfilechooserwidget.c              |   38 +-
 gtk/gtkflowbox.c                        |   49 +-
 gtk/gtkimmodule.c                       |    2 +
 gtk/gtklistbox.c                        |   45 +
 gtk/gtkmenusectionbox.c                 |   36 +-
 gtk/gtkmenusectionbox.h                 |    4 +-
 gtk/gtkmodules.c                        |    4 +
 gtk/gtknotebook.c                       |    3 +-
 gtk/gtkplacessidebar.c                  |   17 +-
 gtk/gtkpopover.c                        |    5 +-
 gtk/gtkprintbackend.c                   |    5 +-
 gtk/gtkstack.c                          |  131 +-
 gtk/gtktextlayout.c                     |    3 +-
 gtk/queryimmodules.c                    |    2 +
 po-properties/es.po                     |19728 ++++++++++++++++---------------
 po/es.po                                |14245 ++++++++++-------------
 po/oc.po                                |15121 ++++++++++--------------
 testsuite/gtk/adjustment.c              |    2 +
 testsuite/tools/Makefile.am             |    1 +
 38 files changed, 22649 insertions(+), 27225 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]