summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-19 14:24:27 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-19 14:24:27 +0100
commitd2774e48780a6350b7435b5975397e0234e300bf (patch)
tree6b28f20b0c2b39422c92caaac71b936fca7989f6 /m4
parent15eb883def371a660ee8c9e8f47edb164d0a7feb (diff)
parent048c41a4661a6fffc5a4842390902493eea82168 (diff)
downloadxine-lib-d2774e48780a6350b7435b5975397e0234e300bf.tar.gz
xine-lib-d2774e48780a6350b7435b5975397e0234e300bf.tar.bz2
Merge from 1.1, dropping the channels.conf patch for XDG-related reasons.
--HG-- rename : m4/_xine.m4 => m4/types.m4 rename : po/libxine1.pot => po/libxine2.pot
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions