- Committer: Benji York
- Date: 2011-12-23 19:21:22 UTC
- mfrom: (14594 devel)
- Revision ID: benji.york@canonical.com-20111223192122-qunpr4wo1riwojip
merge from devel, fixing conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
apidoc-configure-normal.zcml
|
11073.1.20 | 14 years ago | Guilherme Salgado | Add configs/testrunner/apidoc-configure-normal.zcm | . |
|
|
launchpad-lazr.conf |
14486.6.4 | 13 years ago | William Grant | Merge devel. | 5.3 KB |
|
|
|
launchpad.conf |
12156.2.3 | 13 years ago | Edwin Grubbs | Turned devmode back on. Formatted imports. | 1.3 KB |
|
|
|
test-process-lazr.conf |
8538.3.3 | 15 years ago | Abel Deuring | RF merge; conflict resolved | 198 bytes |
|
|
|
yuitest.zcml |
13992.1.2 | 13 years ago | Gary Poster | clean up some lint and make tests pass by adding f | 512 bytes |
|
|