diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-16 00:25:23 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-16 00:25:23 -0500 |
| commit | c10e7925277424b96cd4bf6c605e9c6e7eeb3e7d (patch) | |
| tree | fdda9d104f41805974ada6cb400f94203e67be25 /kde-unstable/kdeedu-kiten | |
| parent | b946c00c4a9d7e8825a99e5bf93d220ad706642a (diff) | |
| parent | ebe74a263db3899367e12d936f908cdfdee7ec15 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
multilib/q4wine/PKGBUILD
Diffstat (limited to 'kde-unstable/kdeedu-kiten')
0 files changed, 0 insertions, 0 deletions