Initiative

Merge lp:~csmith/initiative/tunk into lp:initiative

  1. tunk
  2. Merge into trunk
Proposed by Christian Smith
Status: Merged
Approved by: Christian Smith
Approved revision: 13
Merge reported by: Christian Smith
Merged at revision: not available
Proposed branch: lp:~csmith/initiative/tunk
Merge into: lp:initiative
Diff against target: 18 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~csmith/initiative/tunk
Reviewer Review Type Date Requested Status
Christian Smith Pending
Review via email: mp+61552@code.launchpad.net

Commit message

merging the two branches back together

Description of the change

I misspelled 'trunk'

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/resources.ap_'
2Binary files bin/resources.ap_ 2011-05-18 19:28:01 +0000 and bin/resources.ap_ 2011-05-19 12:27:30 +0000 differ
3=== added file 'res/drawable-hdpi/hp_down.png'
4Binary files res/drawable-hdpi/hp_down.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/hp_down.png 2011-05-19 12:27:30 +0000 differ
5=== added file 'res/drawable-hdpi/hp_up.png'
6Binary files res/drawable-hdpi/hp_up.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/hp_up.png 2011-05-19 12:27:30 +0000 differ
7=== added file 'res/drawable-ldpi/bloodied.png'
8Binary files res/drawable-ldpi/bloodied.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/bloodied.png 2011-05-19 12:27:30 +0000 differ
9=== added file 'res/drawable-ldpi/hp_down.png'
10Binary files res/drawable-ldpi/hp_down.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/hp_down.png 2011-05-19 12:27:30 +0000 differ
11=== added file 'res/drawable-ldpi/hp_up.png'
12Binary files res/drawable-ldpi/hp_up.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/hp_up.png 2011-05-19 12:27:30 +0000 differ
13=== added file 'res/drawable-mdpi/bloodied.png'
14Binary files res/drawable-mdpi/bloodied.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/bloodied.png 2011-05-19 12:27:30 +0000 differ
15=== added file 'res/drawable-mdpi/hp_down.png'
16Binary files res/drawable-mdpi/hp_down.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/hp_down.png 2011-05-19 12:27:30 +0000 differ
17=== added file 'res/drawable-mdpi/hp_up.png'
18Binary files res/drawable-mdpi/hp_up.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/hp_up.png 2011-05-19 12:27:30 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: