- Committer: Christopher Lee
- Date: 2013-10-14 01:30:56 UTC
- mfrom: (138.2.315 unity8)
- mto: (138.2.323 trunk)
- Revision ID: chris.lee@canonical.com-20131014013056-3yqej1khh1wj591f
Merge trunk, resolve conflict
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
.bazaar
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
.bzr-builddeb
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Applications
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Bottombar
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
cmake
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Components
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Dash
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
debian
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
doc
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
graphics
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Greeter
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Hud
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Launcher
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Notifications
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
Panel
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
plugins
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
po
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
SideStage
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
src
|
2.5.47 | 11 years ago | Nick Dedekind | moved indicator cpp source to src folder. |
|
||
|
tests
|
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou |
|
||
|
upstart-session
|
138.291.4 | 11 years ago | Christopher Lee | Add unity8.conf to lp:unity8 |
|
||
.bzrignore |
59.1.1 | 11 years ago | Michael Zanetti | improve the bzr commit hook - don't run qmltests | 147 bytes |
|
|
|
.gitignore |
4.1.1 | 11 years ago | Michał Sawicz | Support git-backed checkout in run_on_device. Als | 135 bytes |
|
|
|
ApplicationArguments.h |
123.1.1 | 11 years ago | Nick Dedekind | Added ApplicationArguments context property to pas | 1.5 KB |
|
|
build |
138.126.2 | 11 years ago | Jussi Pakkanen | Use ccache only if compilers are not explicitly se | 2.3 KB |
|
|
|
CMakeLists.txt |
138.234.31 | 11 years ago | Michael Zanetti | merge trunk | 4.8 KB |
|
|
|
CODING |
138.24.2 | 11 years ago | Michał Sawicz | Fix some words. | 3.8 KB |
|
|
|
COPYING |
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou | 34.3 KB |
|
|
|
COPYING.LGPL |
46.4.2 | 11 years ago | Didier Roche | ship required license files | 26.1 KB |
|
|
|
LGPL_EXCEPTION.txt |
46.4.2 | 11 years ago | Didier Roche | ship required license files | 1.1 KB |
|
|
|
main.cpp |
138.280.1 | 11 years ago | Albert Astals | Fix crash on the phone For some reason i'm gettin | 7.8 KB |
|
|
|
MouseTouchAdaptor.cpp |
138.168.1 | 11 years ago | Daniel d'Andrada | Make MouseTouchAdaptor work with multiple QWindows | 4.8 KB |
|
|
|
MouseTouchAdaptor.h |
138.168.1 | 11 years ago | Daniel d'Andrada | Make MouseTouchAdaptor work with multiple QWindows | 1.5 KB |
|
|
|
paths.h.in |
2.5.90 | 11 years ago | Nick Dedekind | merged with trunk | 2.4 KB |
|
|
|
run |
138.238.13 | 11 years ago | Michal Hruby | Revert icon theme modification | 2.1 KB |
|
|
|
run_on_device |
138.226.1 | 11 years ago | Albert Astals | Revert r388 Seems to be causing bug #1235268 | 4.1 KB |
|
|
|
runtests.sh |
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou | 4.4 KB |
|
|
|
Shell.qml |
138.264.2 | 11 years ago | Nick Dedekind | removed console debug | 27.3 KB |
|
|
|
unity8.desktop.in |
1 | 11 years ago | Michał Sawicz | Inital unity8 commit. Previous history can be fou | 219 bytes |
|
|
|
unity8.qmlproject |
2.5.63 | 11 years ago | Nick Dedekind | Renamed indicator menus to menu items. | 554 bytes |
|
|