diff options
| author | Ismael Luceno | 2008-03-11 01:48:59 -0300 |
|---|---|---|
| committer | Ismael Luceno | 2008-03-11 01:48:59 -0300 |
| commit | 6ce57b97a3ce68402e781903051505b83725cd2c (patch) | |
| tree | 868ab624b91a923bc56e43ec25e586229b290dee /gurus.gpg | |
| parent | d48b8775a972b828e11824b748485ff1bfeb8931 (diff) | |
| parent | 2ceca27def5294e0c5c283f3ad340ac7dc07cb55 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
Conflicts:
ChangeLog
archive/rpm/HISTORY
chat-im/pidgin/HISTORY
disk/xfsprogs/HISTORY
editors/pdfedit/HISTORY
graphics/wings3d/HISTORY
kernels/linux/HISTORY
libs/stlport/HISTORY
security-libs/linux-pam/HISTORY
Diffstat (limited to 'gurus.gpg')
0 files changed, 0 insertions, 0 deletions