gergely
/
astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into chart-db 

Conflicts:
        src/ag-chart.h
        src/ag-window.c

Conflicts fixed without problems.
This commit is contained in:
Gergely Polonkai 2014-08-01 18:03:27 +02:00
parent c79e24c709 c22fc02a2a
commit d30b31ce7e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ag-window.c
View File

@ -5,6 +5,7 @@
#include <libxml/tree.h>
#include <webkit2/webkit2.h>
#include <libgd/gd-main-view.h>
#include <gtk/gtk.h>
#include <swe-glib.h>

4
src/resources/ui/ag-window.ui
View File

@ -165,7 +165,7 @@
<property name="can_focus">False</property>
<property name="action_name">win.gear-menu</property>
<property name="menu_model">gear_menu</property>
<property name="use_popover">True</property>
<property name="use_popover">False</property>
<style>
<class name="image-button"/>
</style>
@ -188,7 +188,7 @@
<property name="can_focus">False</property>
<property name="action_name">win.view-menu</property>
<property name="menu_model">view_menu</property>
<property name="use_popover">True</property>
<property name="use_popover">False</property>
<style>
<class name="image-button"/>
</style>