Commit Graph

32 Commits

Author SHA1 Message Date
b9d0833329 Merge "this is a new branch" 2012-03-03 00:32:40 -05:00
c0b2c52248 Merge "test again" 2012-03-03 00:32:15 -05:00
f25b52e9bf this is a new branch
Change-Id: Id5c64933d3c2bd8e92c07c90d977288c200efd2c
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-03 00:32:05 -05:00
47b8b60d5f test again
Change-Id: Ib8d3b8484712bc7914bf52f5e4747de1a247286e
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-03 00:31:06 -05:00
4a732f8326 Merge "this is another test" 2012-03-03 00:28:09 -05:00
842f5d4dd8 this is another test
Change-Id: Iee9030a212814c1a1f1ef0f6dbb3695f007da85d
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-03 00:20:56 -05:00
8e67dbaf15 Merge "a bug fix" 2012-03-03 00:17:52 -05:00
c682f61658 a bug fix
Change-Id: I143071c027dc94ec9937816048ec23d6b7f3669d
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-03 00:17:11 -05:00
56dc5f55f3 addeed another true
Change-Id: Ibaa72bdd6ca1864398951a4a4e963008b911a759
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-03 00:13:29 -05:00
da009f0d61 true again
Change-Id: I2ad13202a19cfcfa41b23dcd160d1cbddc9df387
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-03 00:06:10 -05:00
09519e9ed8 test
Change-Id: Iab82f7cbaf9bce9e26e7b4dc80976d812ccd2d75
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 23:51:43 -05:00
6f2a4af532 false
Change-Id: Ie4fc15aef0ddb47c6c3ce43ab09b92c2e10b5aa1
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 23:47:22 -05:00
8d0199dca8 added trueisum
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 23:43:39 -05:00
9e6661733e Merge branch 'bug'
Conflicts:
	test/src/com/test/Main.java

Change-Id: I69e1688faa3d74ceb2b4aa60446c9d28daa6d2d8
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:18:28 -05:00
11315f9ee6 poop
Change-Id: I43950dd6d378138de264a6320cb5d19d23a22e10
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:17:17 -05:00
6995093b5d sleep
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:15:36 -05:00
66a2f9867b yay
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:14:50 -05:00
93c4f31d63 woot
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:13:48 -05:00
c442d42b30 another change
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:12:43 -05:00
8d2bcf8f62 master!
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:11:42 -05:00
673928763c Signed-off-by: Ricky Barrette <rickbarrette@gmail.com> 2012-03-02 12:10:56 -05:00
836b687c40 Commit with a change id
Change-Id: I5ec291bbbd41455901e7d5fdcac907fe6ad167b2
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 11:24:43 -05:00
b6b39627a9 Merge branch 'testing' into development
Conflicts:
	test/src/com/test/Main.java

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 11:20:57 -05:00
58825b1872 implmented the contructor to print "this is a test"
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 11:16:33 -05:00
19ab349346 updated to print new lines
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 11:06:50 -05:00
b9bf0471c9 Implmented the contructor
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 11:05:19 -05:00
aa0cfeffe0 even more output added
Change-Id: I7b979225e1686342cdab2144ab075704655dc79e
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-01 12:25:08 -05:00
1545921040 Merge branch 'dev' 2012-03-01 12:14:40 -05:00
d88750a5e4 added more output
Change-Id: Iaa42bbc2e2aeb77cfe88ea34a1970ffb1a7fa19e
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-01 12:14:13 -05:00
e1c6a50b8f added comments
Change-Id: Idbb8379cb45a26dca3bffd00c18af2a52bf71be2
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-01 12:13:21 -05:00
ed24ef47b7 added some output
Change-Id: I1e63e7a622a0d8ff0c8a5074a46b6b65c34f500d
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-01 12:12:02 -05:00
51432089c5 Initial Project
Change-Id: I341141c2e2870bd0545937e4e55ad25c86af4ef7
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-01 12:09:49 -05:00