diff options
author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-18 10:36:32 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-18 10:36:32 -0500 |
commit | 02c6fa41964c6bb1e7f285ff530e8082b9326399 (patch) | |
tree | 2c13819f471dca50955bddeadbf940ff3631c1e2 /extra/kaffeine | |
parent | 8c0e0492541a5ef68bf2814712502103d8f475b5 (diff) | |
parent | a4f85b5a8c5460995c83445460351846cde419f8 (diff) |
Merge branch 'master' of http://projects.parabolagnulinux.org/abslibre-mips64el
Conflicts:
extra/python/PKGBUILD
Diffstat (limited to 'extra/kaffeine')
0 files changed, 0 insertions, 0 deletions