- Committer: Olivier Tilloy
- Date: 2014-06-02 08:49:13 UTC
- mfrom: (447.1.132 oxide)
- Revision ID: olivier.tilloy@canonical.com-20140602084913-nlnxq9zrm5w5ygzi
Merge the latest changes from trunk and resolve a bunch of conflicts.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
build
|
129 | 10 years ago | Chris Coulson | Add a gyp qmake module |
|
||
|
patches
|
1 | 10 years ago | Chris Coulson | Initial import |
|
||
|
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
|
447.5.1 | 9 years ago | Chris Coulson | Move depot_tools and chromium in to third_party |
|
||
.bzrignore |
447.5.3 | 9 years ago | Chris Coulson | Update .bzrignore | 115 bytes |
|
|
|
CHROMIUM_VERSION |
447.1.123 | 9 years ago | Chris Coulson | Update Chromium to 37.0.2008.2 | 12 bytes |
|
|
|
client.py |
447.1.121 | 9 years ago | Alexandre Abreu | fix win8 exclusion | 8 KB |
|
|
|
CMakeLists.txt |
447.5.12 | 9 years ago | Chris Coulson | Tidy up messages in CMakeLists.txt | 5.5 KB |
|
|
|
patch-tool.py |
447.5.6 | 9 years ago | Chris Coulson | Checkout the ninja git repo | 8.8 KB |
|
|
|
release-tool.py |
447.1.130 | 9 years ago | Chris Coulson | Drop the hidden .channel file, as it's fairly poin | 8.3 KB |
|
|