- Committer: Olivier Tilloy
- Date: 2016-01-12 11:45:54 UTC
- mfrom: (1272.1.36 oxide)
- Revision ID: olivier.tilloy@canonical.com-20160112114554-kt57hdrqixa2zqy4
Merge the latest changes from trunk and resolve a minor conflict.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
build
|
129 | 10 years ago | Chris Coulson | Add a gyp qmake module |
|
||
|
po
|
684.1.1 | 9 years ago | Alexandre Abreu | initial draft |
|
||
|
qt
|
49 | 10 years ago | Chris Coulson | Get rid of liboxideprivate.so. It doesn't really m |
|
||
|
shared
|
49 | 10 years ago | Chris Coulson | Get rid of liboxideprivate.so. It doesn't really m |
|
||
|
third_party
|
539.1.1 | 9 years ago | Chris Coulson | Move depot_tools and chromium in to third_party |
|
||
.bzrignore |
640.2.12 | 8 years ago | Chris Coulson | Ensure rebase-chromium.py works for branches | 129 bytes |
|
|
|
.editorconfig |
1138 | 8 years ago | Chris Coulson | Add a basic editorconfig file - you can get editor | 120 bytes |
|
|
|
checkout.conf |
1272.1.27 | 8 years ago | Chris Coulson | Bump Chromium rev to 3bbb11d8 (49.0.2612.0) | 726 bytes |
|
|
|
CMakeLists.txt |
1262.1.29 | 8 years ago | Chris Coulson | Hide the camera support behind a new build option | 7.4 KB |
|
|
|
init-checkout.py |
640.2.14 | 8 years ago | Chris Coulson | Remove the entire Chromium checkout on this upgrad | 11.7 KB |
|
|