summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-16 16:52:45 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-16 16:52:45 +0200
commit8bfa56648d42d1ad264b9754ea00d336c8ee471c (patch)
tree5149f2c4850a40a473a31b8847b7538e632890b0 /.hgtags
parent4d20f1283f883dff0475dbda65090689823959e6 (diff)
parentafa2b8714f2e5dcbc45099c9a9418b25bfcc097f (diff)
downloadminetest-8bfa56648d42d1ad264b9754ea00d336c8ee471c.tar.gz
minetest-8bfa56648d42d1ad264b9754ea00d336c8ee471c.tar.bz2
minetest-8bfa56648d42d1ad264b9754ea00d336c8ee471c.zip
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 726f5ccfb..2911487cf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -14,3 +14,5 @@ dd08a9b5cb84d55b7576bb3fde3068dd263bc3bc 0.2.20110618_0_dev
25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
0000000000000000000000000000000000000000 0.2.20110704_0
+0000000000000000000000000000000000000000 0.2.20110704_0
+65263ec55caf526e3f3e0bdc6657ce42daee46bc 0.2.20110704_0