* fix automerge regression
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Fri, 15 Jul 2011 18:16:02 +0000 (20:16 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Fri, 15 Jul 2011 18:16:02 +0000 (20:16 +0200)
commit4d20f1283f883dff0475dbda65090689823959e6
treee220cec0ad4ef16bb42e69a2f5486ff7aad8954c
parent0a38e542c1854422b95ddad2b9634693e342a5ff
* fix automerge regression
src/environment.cpp