- Committer: Raphaël Valyi
- Date: 2009-10-28 20:12:54 UTC
- Revision ID: rvalyi@gmail.com-20091028201254-oxcmetgpxbp2oelp
[MERGE] bzr merge -r 1856..1857 lp:openobject-server . rev #1857 we merge here consists in a fix by Tiny because they didn't applied the etree conversion properly weeks back (the 2 previous merges here); part
was already better merged on our side (2 commits back) because we resolved the conflicts more carefully.
was already better merged on our side (2 commits back) because we resolved the conflicts more carefully.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bin
|
1 | 17 years ago | pinky | New trunk |
|
||
|
doc
|
1 | 17 years ago | pinky | New trunk |
|
||
|
man
|
1 | 17 years ago | pinky | New trunk |
|
||
|
pixmaps
|
303 | 16 years ago | ced | SERVER: improve win32 installer |
|
||
|
win32
|
300 | 16 years ago | ced | KERNEL: add win32 compile |
|
||
.bzrignore |
1729.1.23 | 15 years ago | Christophe Simonis | [FIX] ignore filestore | 52 bytes |
|
|
|
Makefile |
1844.1.6 | 14 years ago | Harry (Open ERP) | [IMP]quality_integration_server: make link of extr | 1.7 KB |
|
|
|
MANIFEST.in |
1532 | 15 years ago | Stephane Wirtel | [FIX] Add missing files | 400 bytes |
|
|
|
README |
1401.1.3 | 15 years ago | Stephane Wirtel | [FIX] There was a warning about this file with the | 1 KB |
|
|
|
rpminstall_sh.txt |
1680.1.2 | 15 years ago | Stephane Wirtel | [FIX] generate the pyc for redhat | 673 bytes |
|
|
|
setup.cfg |
1725 | 15 years ago | Stephane Wirtel | 5.0.0-3 | 335 bytes |
|
|
|
setup.nsi |
1475 | 15 years ago | Stephane Wirtel | [FIX] Use allinone flag | 9.6 KB |
|
|
setup.py |
1812 | 14 years ago | Christophe Simonis | [IMP] change version number | 8.8 KB |
|
|