# HG changeset patch
# User Bjoern Gruening <bjoern.gruening@gmail.com>
# Date 1369775498 -7200
# Node ID 172caea2920dc047a575c8be6054c27745f94045
# Parent  f35921c5d68d7d6b14a7e942968b7c34b123d303# Parent  c904022ce8e2c2da9d1de14f2e1c8860fa0b5ccb
merge

diff -r c904022ce8e2 -r 172caea2920d .hgignore
--- a/.hgignore	Mon May 27 14:34:37 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-.tar*
\ No newline at end of file
diff -r c904022ce8e2 -r 172caea2920d repository_dependencies.xml
diff -r c904022ce8e2 -r 172caea2920d tool_dependencies.xml