[zanata-commits] [zanata/zanata-python-client] 7f0f3d: Fix the dstdir option issue of po pull(rhbz#696437...

[noreply at github.com]

Branch: refs/heads/devel
Home:   https://github.com/zanata/zanata-python-client

Commit: 7f0f3d0d1014adb1b57b31ec04c9bcba9122dbc9
    https://github.com/zanata/zanata-python-client/commit/7f0f3d0d1014adb1b57b31ec04c9bcba9122dbc9
Author: James Ni <kent.neo at gmail.com>
Date:   2011-04-18 (Mon, 18 Apr 2011)

Changed paths:
  M VERSION-GEN
  M setup.py
  M zanataclient/zanata.py

Log Message:
-----------
Fix the dstdir option issue of po pull(rhbz#696437), make VERSION-GEN generate VERSION-FILE under zanataclient, setup.py also read VERSION-FILE from zanataclient


Commit: b3d260e8bdc2cb95d8c245a901c17024ef3230ba
    https://github.com/zanata/zanata-python-client/commit/b3d260e8bdc2cb95d8c245a901c17024ef3230ba
Author: James Ni <kent.neo at gmail.com>
Date:   2011-04-18 (Mon, 18 Apr 2011)

Changed paths:
  M .pydevproject
  M zanataclient/zanata.py

Log Message:
-----------
Merge branch 'devel' of github.com:zanata/zanata-python-client into devel

Conflicts:
	zanataclient/zanata.py


Commit: 0e90977fe121820a6ca83e0446044a9b7679e504
    https://github.com/zanata/zanata-python-client/commit/0e90977fe121820a6ca83e0446044a9b7679e504
Author: James Ni <kent.neo at gmail.com>
Date:   2011-04-18 (Mon, 18 Apr 2011)

Changed paths:
  M zanataclient/zanata.py

Log Message:
-----------
Fix the conflict of merge


Compare: https://github.com/zanata/zanata-python-client/compare/0921349...0e90977