diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-19 21:01:08 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-19 21:01:08 +0200 |
| commit | c7debbe08c7830f26b7080b5f84381202983e5b6 (patch) | |
| tree | 6b03072ad0ad932305fc462e319395f35e2b8854 /ubuntu/precise/tdeedu/debian/tdeedu-doc-html.doc-base.khangman | |
| parent | 81cfe3de65065da2e9693971b05ee35cca6bf483 (diff) | |
| parent | b6a7c10f390060cdd3a9204ad260cc3d3e572038 (diff) | |
| download | tde-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 'ubuntu/precise/tdeedu/debian/tdeedu-doc-html.doc-base.khangman')
0 files changed, 0 insertions, 0 deletions