[EGIT] [apps/ephoto] master 02/02: Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto

2016-01-23 Thread Stephen Houston 
okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=6c38b82f950cadb60d548caa51167784bb53c1a0

commit 6c38b82f950cadb60d548caa51167784bb53c1a0
Merge: 71e1ef6 aa2c756
Author: Stephen Houston 
Date:   Sat Jan 23 12:13:11 2016 -0600

Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto

 configure.ac| 2 +-
 src/bin/Makefile.am | 2 +-
 src/bin/ephoto.c| 2 +-
 src/bin/ephoto.h| 7 ---
 src/bin/ephoto_config.c | 8 
 src/bin/ephoto_main.c   | 5 +++--
 6 files changed, 14 insertions(+), 12 deletions(-)

--

[EGIT] [apps/ephoto] master 02/02: Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto

2015-08-10 Thread Stephen Houston 
okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=ddcc5e08a58cba42d8d5fbe76f6196dc4d7a0b74

commit ddcc5e08a58cba42d8d5fbe76f6196dc4d7a0b74
Merge: 90e819b 03a4be0
Author: Stephen Houston smhousto...@gmail.com
Date:   Mon Aug 10 14:33:59 2015 -0500

Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto

 po/LINGUAS |   1 +
 po/it.po   | 159 +
 2 files changed, 160 insertions(+)

--