summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-10-23 23:15:36 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-10-23 23:15:36 +0100
commit7f0cb19782f4ac1de0f35bf3321be03b30a7179c (patch)
treeaf7539b3eb33846dffe4645d52aa00a0720ed82e /misc
parent9b6900307db58fd1adcc1311e1938f74225bc549 (diff)
parent063fce405f6dd99f78040a0087ab4c602c5b96fc (diff)
downloadxine-lib-7f0cb19782f4ac1de0f35bf3321be03b30a7179c.tar.gz
xine-lib-7f0cb19782f4ac1de0f35bf3321be03b30a7179c.tar.bz2
Merge from 1.1, updating plugin Conflicts/Replaces accordingly.
Diffstat (limited to 'misc')
0 files changed, 0 insertions, 0 deletions