Marcus Meissner : gphoto2.ds: Merge ds_ctrl.c into gphoto2_main.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2fc6cea11a9575c0eee7d6d70bf29da4928f680e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fc6cea11a9575c0eee7d6d70bf29da4928f680e

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Sat Dec  6 12:30:35 2008 +0100

gphoto2.ds: Merge ds_ctrl.c into gphoto2_main.c.

---

 dlls/gphoto2.ds/Makefile.in    |    1 -
 dlls/gphoto2.ds/ds_ctrl.c      |  610 ----------------------------------------
 dlls/gphoto2.ds/gphoto2_i.h    |   82 ------
 dlls/gphoto2.ds/gphoto2_main.c |  520 ++++++++++++++++++++++++++++++++++
 4 files changed, 520 insertions(+), 693 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fc6cea11a9575c0eee7d6d70bf29da4928f680e