diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:11:10 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:11:10 -0500 |
| commit | 1af131a512b6cf244a8b50565e0553f9b11b4328 (patch) | |
| tree | bcb9ce4754c164fd79091e3cb6861d4df82dc1e1 /pcr/conky-control | |
| parent | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (diff) | |
| parent | 994ea903447400adf05d1da1d36d7df8f7dbcd56 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Conflicts:
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
libre/iceweasel-libre/libre.patch
libre/iceweasel-libre/mozconfig
Diffstat (limited to 'pcr/conky-control')
0 files changed, 0 insertions, 0 deletions