Merge lp:~openerp-dev/openobject-server/6.0-bug-754481-xrg into lp:openobject-server/6.0

Proposed by xrg
Status: Merged
Merged at revision: 3397
Proposed branch: lp:~openerp-dev/openobject-server/6.0-bug-754481-xrg
Merge into: lp:openobject-server/6.0
Diff against target: 11 lines (+0/-1)
1 file modified
bin/release.py (+0/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-bug-754481-xrg
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+56908@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/release.py'
2--- bin/release.py 2011-04-01 14:25:28 +0000
3+++ bin/release.py 2011-04-08 10:33:48 +0000
4@@ -1,4 +1,3 @@
5-#!/usr/bin/env python
6 # -*- encoding: utf-8 -*-
7 ##############################################################################
8 #
9
10=== modified file 'bin/tools/graph.py' (properties changed: -x to +x)
11=== modified file 'bin/tools/which.py' (properties changed: -x to +x)