diff options
author | Darrell Anderson <[email protected]> | 2013-03-03 23:28:05 -0600 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2013-03-03 23:28:05 -0600 |
commit | bea677103191c0080393319cd00af0cb1cce60f7 (patch) | |
tree | d25649f917fac75820ff80c583256cc378c522d1 /admin | |
parent | b98e850ded482435f4cb9686c72c46256bcdf2b3 (diff) | |
parent | 7048da84fc926fffd2284dbce0808f1c57eb8742 (diff) | |
download | tdeio-umountwrapper-bea677103191c0080393319cd00af0cb1cce60f7.tar.gz tdeio-umountwrapper-bea677103191c0080393319cd00af0cb1cce60f7.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kio-umountwrapper
Conflicts:
admin
cmake
Diffstat (limited to 'admin')
m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin deleted file mode 160000 -Subproject 4af57bf22967e6ad80ab898980ed505df6eae5b |