# HG changeset patch
# User koda
# Date 1295225055 -3600
# Node ID 03aa62a649780a032d3640c915c6d9508ff92c82
# Parent  673f74c89687de84afd64d30d39aeb415aa9d162# Parent  20b81fafd236beb296b7c49ad265493c468be1ed
merge experimental3D in default

diff -r 20b81fafd236 -r 03aa62a64978 .hgignore