Merge lp:~doughywilson/cellswarm/main into lp:cellswarm

Proposed by Doughy
Status: Merged
Approved by: Doughy
Approved revision: not available
Merge reported by: Doughy
Merged at revision: not available
Proposed branch: lp:~doughywilson/cellswarm/main
Merge into: lp:cellswarm
Diff against target: 11 lines (+0/-2)
1 file modified
android_code/src/com/xandem/swarm/ (+0/-2)
To merge this branch: bzr merge lp:~doughywilson/cellswarm/main
Reviewer Review Type Date Requested Status
Doughy Approve
Review via email:
To post a comment you must log in.
Revision history for this message
Doughy (doughywilson) wrote :

I am testing this merge from Joey's branch into the main swarm trunk.

Revision history for this message
Doughy (doughywilson) wrote :

Joey is approving this test.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'android_code/src/com/xandem/swarm/'
2--- android_code/src/com/xandem/swarm/ 2010-01-07 05:32:17 +0000
3+++ android_code/src/com/xandem/swarm/ 2010-01-07 07:17:13 +0000
4@@ -1,7 +1,5 @@
5 package com.xandem.swarm;
7-// MK test comments
9 import java.util.List;
11 import;


People subscribed via source and target branches

to all changes: