projects / geeqie.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89d8c20 d3621de)
Merge remote-tracking branches 'origin/merge-requests/10' and 'origin/merge-requests/9'
authorKlaus Ethgen <Klaus@Ethgen.de>
Sun, 26 Jan 2014 12:30:18 +0000 (13:30 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sun, 26 Jan 2014 12:30:18 +0000 (13:30 +0100)
commitde24ca6e169fc08e2bc6db1ee9054bd77b6623b0
treed2e17c2f805086bffdf021fd5b91566237f58483tree | snapshot (tar.gz tar.bz2)
parent89d8c20e495e2b59fd98899f772aafa361c0cbeccommit | diff
parentd3621deb49713aad7c9758322b34316f4134a74fcommit | diff
Merge remote-tracking branches 'origin/merge-requests/10' and 'origin/merge-requests/9'

Merge in some trivial but useful merge requests. (Note that 9 includes 8.)

* origin/merge-requests/10:
  transifex config file allowing to easily use transifex-client

* origin/merge-requests/9:
  Skip over expanded keys.
  Annotate debug_exception() with source file, line, and function.
Image viewer forked from GQView