- Committer: Olivier Tilloy
- Date: 2014-04-10 05:35:54 UTC
- mfrom: (312.2.184 oxide)
- Revision ID: olivier.tilloy@canonical.com-20140410053554-5rhvct6th31nqn8i
Merge the latest changes from trunk and resolve a couple of conflicts.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
build
|
129 | 10 years ago | Chris Coulson | Add a gyp qmake module |
|
||
|
chromium
|
1 | 10 years ago | Chris Coulson | Initial import |
|
||
|
patches
|
1 | 10 years ago | Chris Coulson | Initial import |
|
||
|
po
|
315 | 10 years ago | Olivier Tilloy | Add a build target to generate a pot file from int |
|
||
|
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 |
|
||
.bzrignore |
312.7.2 | 10 years ago | jdstrand | update based on Olivier's feedback in the merge re | 112 bytes |
|
|
|
.channel |
258 | 10 years ago | Chris Coulson | Add release-tool.py script for creating a tarball. | 6 bytes |
|
|
|
client.py |
312.2.70 | 10 years ago | Chris Coulson | Fix a new exception on a fresh checkout | 5.9 KB |
|
|
|
CMakeLists.txt |
333 | 10 years ago | Olivier Tilloy | Re-add the po directory to the build. | 5.2 KB |
|
|
|
gclient.conf |
312.2.179 | 10 years ago | Chris Coulson | Update to Chromium 35.0.1916.27 | 551 bytes |
|
|
|
patch-tool.py |
312.2.48 | 10 years ago | Chris Coulson | Stop leaving pyc files everywhere | 8.8 KB |
|
|
|
release-tool.py |
312.2.125 | 10 years ago | Chris Coulson | Update exclude list for tarball | 8.2 KB |
|
|