summaryrefslogtreecommitdiffstats
path: root/rsc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-03-21 20:16:50 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-03-21 20:17:22 +0000
commitbb54b94e5f48c4f6dce72f59dc6bc83f17d2c590 (patch)
treeee137242a03b8cace3f3fc9aa8bf6f9495bdf2b6 /rsc
parentupdate regression tests for new component registration (diff)
downloadcore-bb54b94e5f48c4f6dce72f59dc6bc83f17d2c590.tar.gz
core-bb54b94e5f48c4f6dce72f59dc6bc83f17d2c590.zip
fix catastrophically wrong merge
Diffstat (limited to 'rsc')
0 files changed, 0 insertions, 0 deletions