diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-06-05 00:09:44 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-06-05 00:09:44 +0800 |
| commit | b1d33938778faa1faa3687e87bb8646d6668992d (patch) | |
| tree | 4c1676f40a867ae06462f3e788b710912a56eea9 /src/empathy-main-window.ui | |
| parent | b788f7ca76096138b65f4518fb4435608cd0f91f (diff) | |
| parent | c06f26d8c999b47c22dcd78f07140d027e8882c7 (diff) | |
| download | gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.gz gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.bz2 gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.lz gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.xz gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.zst gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.zip | |
Merge branch 'debug'
Conflicts:
extensions/Makefile.am
extensions/misc.xml
po/POTFILES.in
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/empathy-main-window.ui')
| -rw-r--r-- | src/empathy-main-window.ui | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index d0460e621..f914979f6 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -139,6 +139,12 @@ <accelerator key="F1" modifiers=""/> </child> <child> + <object class="GtkAction" id="help_debug"> + <property name="name">help_debug</property> + <property name="label" translatable="yes">_Debug</property> + </object> + </child> + <child> <object class="GtkAction" id="help_about"> <property name="stock_id">gtk-about</property> <property name="name">help_about</property> @@ -179,6 +185,7 @@ </menu> <menu action="help"> <menuitem action="help_contents"/> + <menuitem action="help_debug"/> <menuitem action="help_about"/> </menu> </menubar> |