Merge authors: Thinkpad <[email protected]> ------------------------------------------------------------ revno: 3388 [merge] committer: Chao Yuan <[email protected]> timestamp: Tue 2013-11-19 10:41:06 +0100 message: Merge remote-tracking branch 'origin/chaoUnsat' into chaoUnsat Conflicts: pkg/dem/UnsaturatedEngine.cpp
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
