Merge lp://staging/~joerlend.schinstad-deactivatedaccount/quidgets/main into lp://staging/quidgets
Proposed by
Jo-Erlend Schinstad
| Status: | Superseded | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~joerlend.schinstad-deactivatedaccount/quidgets/main | ||||||||
| Merge into: | lp://staging/quidgets | ||||||||
| Diff against target: |
7493 lines (+7316/-0) (has conflicts) 31 files modified
.bzr-builddeb/default.conf (+2/-0) .quickly (+3/-0) Copyright (+14/-0) LICENSE (+676/-0) debian/changelog (+65/-0) debian/compat (+1/-0) debian/control (+36/-0) debian/copyright (+22/-0) debian/python-quickly.widgets.install (+1/-0) debian/rules (+7/-0) debian/source/format (+1/-0) po/quickly-widgets.pot (+182/-0) quickly/prompts/__init__.py (+1024/-0) quickly/tests/test_prompts.py (+37/-0) quickly/widgets/asynch_task_progressbox.py (+310/-0) quickly/widgets/conventions.py (+40/-0) quickly/widgets/couch_grid.py (+444/-0) quickly/widgets/dictionary_grid.py (+525/-0) quickly/widgets/grid_column.py (+881/-0) quickly/widgets/grid_filter.py (+845/-0) quickly/widgets/media_player_box.py (+510/-0) quickly/widgets/press_and_hold_button.py (+76/-0) quickly/widgets/tests/_trial_temp/test.log (+1/-0) quickly/widgets/tests/test_asycnh_task_progress_box.py (+51/-0) quickly/widgets/tests/test_couch_grid.py (+284/-0) quickly/widgets/tests/test_dictionary_grid.py (+276/-0) quickly/widgets/tests/test_grid_filter.py (+138/-0) quickly/widgets/text_editor.py (+398/-0) quickly/widgets/url_fetch_progressbox.py (+125/-0) quickly/widgets/web_cam_box.py (+297/-0) setup.py (+44/-0) Conflict adding file .quickly. Moved existing file to .quickly.moved. Conflict adding file Copyright. Moved existing file to Copyright.moved. Conflict adding file LICENSE. Moved existing file to LICENSE.moved. Conflict adding file __init__.py. Moved existing file to __init__.py.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file quickly. Moved existing file to quickly.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. |
||||||||
| To merge this branch: | bzr merge lp://staging/~joerlend.schinstad-deactivatedaccount/quidgets/main | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Quickly Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixed a _very_ tiny and insignificant bug. The main purpose is to learn how these stuff works so I don't make any mistakes when I make some real changes.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
