aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZapata <zapata@xs4all.nl>2011-01-22 16:52:37 +0100
committerZapata <zapata@xs4all.nl>2011-01-22 16:52:37 +0100
commite2a74c0c5c2da4761227dcefa57fbc976cf3812c (patch)
tree7608a6d20a2de6cacfe3ed7f90bc2df23941bc3b /lib
parent67f51a551abcbc53dcd1e15768cf98889b8f19f5 (diff)
parentc5b447359303979ac91e8cea126d14480536df94 (diff)
downloadkeyringer-e2a74c0c5c2da4761227dcefa57fbc976cf3812c.tar.gz
keyringer-e2a74c0c5c2da4761227dcefa57fbc976cf3812c.tar.bz2
Merge remote branch 'origin/ruby' into ruby
Diffstat (limited to 'lib')
-rwxr-xr-xlib/bash/csr.sh (renamed from lib/keyringer/csr.sh)0
-rw-r--r--lib/bash/functions (renamed from lib/keyringer/functions)0
2 files changed, 0 insertions, 0 deletions
diff --git a/lib/keyringer/csr.sh b/lib/bash/csr.sh
index 881a46f..881a46f 100755
--- a/lib/keyringer/csr.sh
+++ b/lib/bash/csr.sh
diff --git a/lib/keyringer/functions b/lib/bash/functions
index 11d1b86..11d1b86 100644
--- a/lib/keyringer/functions
+++ b/lib/bash/functions