summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-19 21:01:08 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-19 21:01:08 +0200
commitc7debbe08c7830f26b7080b5f84381202983e5b6 (patch)
tree6b03072ad0ad932305fc462e319395f35e2b8854 /redhat/main
parent81cfe3de65065da2e9693971b05ee35cca6bf483 (diff)
parentb6a7c10f390060cdd3a9204ad260cc3d3e572038 (diff)
downloadtde-packaging-c7debbe08c7830f26b7080b5f84381202983e5b6.tar.gz
tde-packaging-c7debbe08c7830f26b7080b5f84381202983e5b6.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Conflicts: redhat/tdebase/tdebase-14.0.0.spec redhat/tdelibs/tdelibs-14.0.0.spec
Diffstat (limited to 'redhat/main')
0 files changed, 0 insertions, 0 deletions