diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
| commit | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (patch) | |
| tree | 34cccc67370ca8d178c21556bc6c6a894bef1f84 /pcr/csync-owncloud/PKGBUILD | |
| parent | 3a5380856fae97f3358dc00522656c9f1fc26187 (diff) | |
| parent | dc26483bfd644bb2ad6dd25e3bb5ca9e2bbe1099 (diff) | |
Merge branch 'wip-merge'
Conflicts:
libre/dpkg/PKGBUILD
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
Diffstat (limited to 'pcr/csync-owncloud/PKGBUILD')
0 files changed, 0 insertions, 0 deletions