diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-16 00:28:30 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-16 00:28:30 -0500 |
| commit | f3fb2f3461135e112cc06062f9f3112f3b6a7d3b (patch) | |
| tree | f5e41c2dc7307a3e68e69f663ac29fea8851e40a /libre-testing | |
| parent | c10e7925277424b96cd4bf6c605e9c6e7eeb3e7d (diff) | |
| parent | 6173fd5a068dc36e2d85c79cfb5319d5c050dc07 (diff) | |
Merge branch 'master' of vparabola:~/projects/abslibre
Conflicts:
libre/initscripts/PKGBUILD
libre/pacman/PKGBUILD
Diffstat (limited to 'libre-testing')
0 files changed, 0 insertions, 0 deletions