summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorMatthieu Gautier <mgautier@fedoraproject.org>2009-05-04 21:11:54 +0200
committerMatthieu Gautier <mgautier@fedoraproject.org>2009-05-04 21:11:54 +0200
commit70b12fe9f6918128b9cffc126ccbe8e0eb61ef35 (patch)
tree7144de68fdfe7472da995df8b96bb09a5e194106 /COPYING
parentbd5dfa965466f89937d97294ac4e06d3f8b3b587 (diff)
parent5bc39fc9f68fe44a42f7fb4fd2a9845931337e49 (diff)
downloadg-ed-it-70b12fe9f6918128b9cffc126ccbe8e0eb61ef35.tar.gz
g-ed-it-70b12fe9f6918128b9cffc126ccbe8e0eb61ef35.tar.xz
g-ed-it-70b12fe9f6918128b9cffc126ccbe8e0eb61ef35.zip
Merge branch 'master' of fedorapeople.org:public_git/g-ed-it into fedorapeople
Conflicts: g-ed-it/gitAction.py
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions