summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-07-31 01:57:24 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2010-07-31 01:57:24 +0200
commitf474a9a060b47bb45ee5573bcfa068b3592429f0 (patch)
tree8e2d78d63d3c082ea461b9f8f7abb39fd0b00374
parent86338f051d1a5bcbc85525ec60fb798aeca33e84 (diff)
parent0f25824a0222a9d8901d7960f23e09d1cba99698 (diff)
parenta826b2ddcf5db522b5a129c2b1107860d1e25297 (diff)
parent28006379a248ccabe4b0d7940821f76bb88c2a67 (diff)
parent0ed2dfe6e525a15798d664f64ebfbe9742e4bd01 (diff)
parent465a13cdec67c7bfef063d3e17be22f22b074498 (diff)
parent3c4f7bfef17c18c1daf45a8a491be32e2f533e03 (diff)
parent9be12b143a2e7445fb502c580cf0a8722e7fa165 (diff)
parent4d7f70735f91e0e3e77919a4433193fe5f31db3b (diff)
parent98e538fed97205e33939bc1a4a23abc9569a76a1 (diff)
parentd1d41c605b5d03975876fb036abb115e2ec5962e (diff)
parentd1d41c605b5d03975876fb036abb115e2ec5962e (diff)
parent86338f051d1a5bcbc85525ec60fb798aeca33e84 (diff)
downloaderlang-f474a9a060b47bb45ee5573bcfa068b3592429f0.tar.gz
erlang-f474a9a060b47bb45ee5573bcfa068b3592429f0.tar.xz
erlang-f474a9a060b47bb45ee5573bcfa068b3592429f0.zip
Initial pseudo merge for dist-git setup
This will significantly simplify future merges between branches.