yade-dev team mailing list archive

Thread
Date

yade-dev team
Mailing list archive
Message #11391

[Branch ~yade-pkg/yade/git-trunk] Rev 3388: Merge remote-tracking branch 'origin/chaoUnsat' into chaoUnsat

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 09 Oct 2014 18:03:32 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Thinkpad <chaoyuan@ubuntu.ubuntu-domain>
------------------------------------------------------------
revno: 3388 [merge]
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
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