Code

Fix pom merge conflicts#3

Code

Open

timmattison wants to merge 21 commits intocybergarage:mastercybergarage/cybergarage-upnp:masterfrom timmattison:fix-pom-merge-conflictstimmattison/CyberLink4Java:fix-pom-merge-conflictsCopy head branch name to clipboard

-212

Commits

Commits on Apr 5, 2013

• Resolved merge conflicts in flash/pom.xml

  

  Tim Mattison

  committed
  3bdbdae

• Resolved merge conflicts in main pom.xml

  

  Tim Mattison

  committed
  9f994cf

• Resolved merge conflicts in proxy/upnp-proxy/pom.xml

  

  Tim Mattison

  committed
  f593ced

• Resolved merge conflicts in proxy/upnp-proxy-gui/pom.xml

  

  Tim Mattison

  committed
  52a2379

• Resolved merge conflicts in proxy/upnp-sample-proxy/pom.xml

  

  Tim Mattison

  committed
  f054c43

• Resolved merge conflicts in rui/upnp-rui/pom.xml

  

  Tim Mattison

  committed
  2c10e25

• Resolved merge conflicts in upnp-stack/pom.xml

  

  Tim Mattison

  committed
  ed3f74f

• Resolved merge conflicts in tools/pom.xml

  

  Tim Mattison

  committed
  cb7b73a

• Partial merge conflict resolution for tools/igd-tool/pom.xml

  

  Tim Mattison

  committed
  6634c54

• Added relative path back to tools/igd-tool/pom.xml

  

  Tim Mattison

  committed
  cb6740a

• Resolved merge conflicts in tools/control-point/pom.xml

  

  Tim Mattison

  committed
  fb6dc22

• Resolved merge conflicts in std/pom.xml

  

  Tim Mattison

  committed
  f700462

• Resolved merge conflicts in samples/washer/pom.xml

  

  Tim Mattison

  committed
  29248f7

• Resolved merge conflicts in samples/tv/pom.xml

  

  Tim Mattison

  committed
  0650136

• Resolved merge conflicts in samples/remote-controller/pom.xml

  

  Tim Mattison

  committed
  70e537a

• Resolved merge conflicts in samples/pom.xml

  

  Tim Mattison

  committed
  fd1ded8

• Resolved merge conflicts in samples/light/pom.xml

  

  Tim Mattison

  committed
  89a4108

• Resolved merge conflicts in samples/clock/pom.xml

  

  Tim Mattison

  committed
  34a10ec

• Resolved merge conflicts in samples/air-conditioner/pom.xml

  

  Tim Mattison

  committed
  86c8f47

• Resolved merge conflicts in rui/upnp-rui-server/pom.xml

  

  Tim Mattison

  committed
  b803c5a

• Resolved merge conflicts in rui/upnp-rui-player/pom.xml

  

  Tim Mattison

  committed
  0b32c4c