Merge lp://qastaging/~richardson183/pchat/trunk into lp://qastaging/~zachary-thibeau/pchat/trunk
Proposed by
Jesse N. Richardson
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~richardson183/pchat/trunk |
| Merge into: | lp://qastaging/~zachary-thibeau/pchat/trunk |
| Diff against target: |
86 lines (+37/-2) 6 files modified
PChat-linux.cbp (+14/-0) PChat-linux.layout (+7/-0) PChat-wx.layout (+4/-0) PChat.layout (+4/-0) pchat-linux.workspace (+6/-0) src/include/version.h (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~richardson183/pchat/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zach Thibeau | Approve | ||
|
Review via email:
|
|||
Description of the change
Merged the changes between my branch and the main trunk. I have made a good bit of changes for the linux build
To post a comment you must log in.
Unmerged revisions
- 272. By Jesse N. Richardson
-
Merged Changes from the main trunk branch
- 271. By Jesse N. Richardson
-
Made a good bit of changes. Changed the locations of the libs to the real path that they will be located at.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
review looks good but I've already merged it into svn in which launchpad should of imported by now.