[gtkmm-documentation/gmenu: 3/4] Merge branch 'master' into gmenu
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation/gmenu: 3/4] Merge branch 'master' into gmenu
- Date: Wed, 7 Aug 2013 12:37:53 +0000 (UTC)
commit 3e43537880d2d97a45ec73a034034818acb8c88c
Merge: 44513f4 98c676f
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Aug 7 14:18:42 2013 +0200
Merge branch 'master' into gmenu
docs/tutorial/C/figures/multithread.png | Bin 0 -> 18549 bytes
docs/tutorial/C/gtkmm-tutorial-in.xml | 29 ++++
docs/tutorial/Makefile.am | 1 +
examples/Makefile.am | 8 +
examples/book/clipboard/ideal/examplewindow.cc | 2 +-
examples/book/clipboard/simple/examplewindow.cc | 2 +-
examples/book/combobox/complex/examplewindow.cc | 1 -
.../book/combobox/entry_complex/examplewindow.cc | 1 -
examples/book/combobox/entry_text/examplewindow.cc | 1 -
examples/book/combobox/text/examplewindow.cc | 1 -
.../dialogs/filechooserdialog/examplewindow.cc | 6 +-
examples/book/entry/icon/examplewindow.cc | 2 +-
examples/book/idle/idleexample.cc | 2 +-
examples/book/infobar/examplewindow.cc | 6 +-
examples/book/multithread/examplewindow.cc | 171 ++++++++++++++++++++
examples/book/multithread/examplewindow.h | 57 +++++++
examples/book/multithread/exampleworker.cc | 99 +++++++++++
examples/book/multithread/exampleworker.h | 46 ++++++
examples/book/multithread/main.cc | 27 +++
examples/book/statusicon/main.cc | 2 +-
examples/book/textview/examplewindow.cc | 3 +-
examples/book/timeout/timerexample.cc | 6 +-
examples/book/toolbar/examplewindow.cc | 17 ++-
examples/book/tooltips/examplewindow.cc | 4 +-
.../book/treeview/drag_and_drop/examplewindow.cc | 2 +-
examples/book/update_ui/examplewindow.cc | 2 +-
26 files changed, 467 insertions(+), 31 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]