Merge remote-tracking branches #419 and #416
authorKlaus Ethgen <Klaus@Ethgen.de>
Fri, 15 Jul 2016 17:39:02 +0000 (18:39 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Fri, 15 Jul 2016 17:39:02 +0000 (18:39 +0100)
commit8a42f589663c3f8095e8fe68805a46a657702752
tree0ddf4b2557546bffe1a5283ff5b61e9182ce73eb
parent9d98d221ea57f57ad52967184b19013ce0e5eeda
parenteb8db3e169228914cddab3cfb06c773711883619
parent3135c2345d7aab6915495768fff88fff7b2759e7
Merge remote-tracking branches #419 and #416

* merge-requests/419:
  Force focus to geeqie after leaving fullscreen

* merge-requests/416:
  Add four new preferences