aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/intltool-merge.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-28 15:17:20 +0000
committermarha <marha@users.sourceforge.net>2010-04-28 15:17:20 +0000
commitf0abc6f0061255195880cc281f428f4adcf3b33a (patch)
tree0b590287c3248959e147bde5862bcb3a8f8bfcc3 /xorg-server/xkbdata.src/intltool-merge.in
parentad63c2d642fc0cbd5f14e5bd36306b30712a95b0 (diff)
downloadvcxsrv-f0abc6f0061255195880cc281f428f4adcf3b33a.tar.gz
vcxsrv-f0abc6f0061255195880cc281f428f4adcf3b33a.tar.bz2
vcxsrv-f0abc6f0061255195880cc281f428f4adcf3b33a.zip
svn merge -r554:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/xkbdata.src/intltool-merge.in')
-rw-r--r--xorg-server/xkbdata.src/intltool-merge.in0
1 files changed, 0 insertions, 0 deletions
diff --git a/xorg-server/xkbdata.src/intltool-merge.in b/xorg-server/xkbdata.src/intltool-merge.in
deleted file mode 100644
index e69de29bb..000000000
--- a/xorg-server/xkbdata.src/intltool-merge.in
+++ /dev/null