Mercurial > hg > truffle
diff LICENSE @ 9442:46e83862cc03
Fix merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 30 Apr 2013 19:51:49 +0200 |
parents | cdef89d821bd |
children |
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 30 Apr 2013 19:51:49 +0200 |
parents | cdef89d821bd |
children |