[Users] Merging Carpet's pmoesta/staggered

[Erik Schnetter]

During today's telecon we realized that Carpet's branch "pmoesta/staggered" should be merged into the master branch.

Prior to doing so, could you (the maintainers of pmoesta/staggered) merge Carpet's master branch into the staggered branch, resolve the conflicts, and test that everything still works fine? Afterwards, merging pmoesta/staggered into the master will be trivial. This moves the burden of merging to the branch, where it is less disruptive, and where one can break down the merging into multiple commits, and test without time pressure.

-erik

-- 
Erik Schnetter <schnetter at cct.lsu.edu>
http://www.perimeterinstitute.ca/personal/eschnetter/

My email is as private as my paper mail. I therefore support encrypting
and signing email messages. Get my PGP key from http://pgp.mit.edu/.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 203 bytes
Desc: Message signed with OpenPGP using GPGMail
Url : http://lists.einsteintoolkit.org/pipermail/users/attachments/20140616/7a1008a1/attachment.bin