{"shas":[["a75aa13693c69ae1dde95798fcf7bbb521aeda90","1fff837050e1ff4164c0898c1c293e7da62bbe21@gmail.com","Merge branch 'local'\n\n* local:\n  Routing functional for BCast and unrel. direct\n\nConflicts:\n\tsrc/edu/stanford/cs194/gmesh/ui/network.java\n\nFixed SMSBroadcast to show origin user.\nFixed TextMessage's use of User.netPack instead of User.id().netPack.\nResegregated network.java for debug use.","jdashg"],["fb90e420c19813532b3d55f4d29e98b62c258f08","1fff837050e1ff4164c0898c1c293e7da62bbe21@gmail.com","Merge branch 'master' of github.com:khetu/CS194_GMesh\n\n* 'master' of github.com:khetu/CS194_GMesh:\n  delete generated R.java.  -TB\n  fix network screen + improve performance. -TB\n\nConflicts:\n\tsrc/edu/stanford/cs194/gmesh/ui/network.java\n\nMore merging/resegregation of network.java.","jdashg"]],"ref":"refs/heads/master","size":2,"head":"fb90e420c19813532b3d55f4d29e98b62c258f08","push_id":32811247}