aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-01 17:30:40 +0200
committermarha <marha@users.sourceforge.net>2011-06-01 17:30:40 +0200
commit17578305174cfc484071553c6fafe79099b73d4d (patch)
tree1f0fc3e06d6801267eeff02cc67335a2385e80d7 /.gitignore
parentd60233950866066e23e8a46ac230aae9f296031e (diff)
parent4d7ec99788d8a1d56ff4bccea279ae8186b18cdc (diff)
downloadvcxsrv-17578305174cfc484071553c6fafe79099b73d4d.tar.gz
vcxsrv-17578305174cfc484071553c6fafe79099b73d4d.tar.bz2
vcxsrv-17578305174cfc484071553c6fafe79099b73d4d.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions