]> git.g-eek.se Git - users/gustav/scripts.git/commitdiff
projects / users / gustav / scripts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 287aa49 9a277ff)
Merge branch 'epsilon' into 'master'
authorGustav Eek <gustav@fripost.org>
Mon, 17 Aug 2015 07:26:47 +0000 (09:26 +0200)
committerGustav Eek <gustav@fripost.org>
Mon, 17 Aug 2015 07:26:47 +0000 (09:26 +0200)
Conflicts:
Makefile

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
index e0237456ed0a571c5065528ce9ad4d0430b54224,6249a042b6d712f24087b6e3e6c754b898608ea9..7f114e117cd883c90f92c891c7193912c20debf6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -7,7 -7,7 +7,8 @@@ INSTALL = $(HOME)/bi
  scripts = \
  msmtp-notify \
  repo-encrypt \
 -confluence-tk
 +exiv2-common-edits \
++confluence-tk \
  
  bash-completion = \
  repo-encrypt \