diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-07-07 21:41:42 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-07-07 21:41:42 -0500 |
commit | a385416a6942ab9609019b97b8a8aa3068b6812e (patch) | |
tree | cc55f608327aa7640c12e3220116fb24564cf780 /elementary/elementary-icons | |
parent | e99a90fb121148ecfdd29c63446c42474c4e2433 (diff) | |
parent | f4b22150c67a332d15bbbf322ab34066b0dfafb6 (diff) |
Merge branch 'master' of vparabola:~/projects/abslibre
Conflicts:
libre/libretools/PKGBUILD
Diffstat (limited to 'elementary/elementary-icons')
0 files changed, 0 insertions, 0 deletions