diff options
author | Federico Mena Quintero <federico@gnome.org> | 2013-02-13 20:15:46 -0600 |
---|---|---|
committer | Federico Mena Quintero <federico@gnome.org> | 2013-02-13 20:37:36 -0600 |
commit | 936045e82bc9a3f2b09612e3c22799c45b101c5e (patch) | |
tree | e4cda00f3d42e8840b11dfa5317a92cf63dcd6a6 /gtk/gtkfilesystem.c | |
parent | 04dbec41913bcfe5b627869ab7c8c3b0797ddd72 (diff) | |
parent | e16ade9836a9ad2a5a4ad568ccd9ed6ed2d7f62d (diff) | |
download | gtk+-936045e82bc9a3f2b09612e3c22799c45b101c5e.tar.gz |
Merge branch 'master' into places-sidebar
Conflicts:
docs/reference/gtk/gtk-docs.sgml
gtk/gtkfilechooserdefault.c
gtk/org.gtk.Settings.FileChooser.gschema.xml
Diffstat (limited to 'gtk/gtkfilesystem.c')
0 files changed, 0 insertions, 0 deletions