summaryrefslogtreecommitdiffstats
path: root/debian/patches/series
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-11-26 09:01:22 +0100
committerDidier Raboud <odyx@debian.org>2013-11-26 09:01:22 +0100
commitba531cb9edf0ef90b17acb84641a9a29edf83ca9 (patch)
treea998dfdcda39b44203f8f3ac7ac17ca09adda8b4 /debian/patches/series
parent0687355c89fc509ebf1ff89d8d27c04082f8bcc5 (diff)
parentd6eb095f2760eab42e852aceae61289ad7ba36ee (diff)
downloadcolobot-ba531cb9edf0ef90b17acb84641a9a29edf83ca9.tar.gz
colobot-ba531cb9edf0ef90b17acb84641a9a29edf83ca9.tar.bz2
colobot-ba531cb9edf0ef90b17acb84641a9a29edf83ca9.zip
Merge commit 'colobot-gold-0.1.2-alpha' into debian
Conflicts: .travis.yml
Diffstat (limited to 'debian/patches/series')
0 files changed, 0 insertions, 0 deletions