Code

Acceptwithoutmerge#91

Code

Merged

WtfJoke merged 7 commits intortcTo:developrtcTo/rtc2git:developfrom ohumbel:acceptwithoutmergeohumbel/rtc2git:acceptwithoutmergeCopy head branch name to clipboardFeb 15, 2016

+16-12

Commits

Commits on Dec 3, 2015

• improve requirements

  ohumbel

  committed
  9aad809

  Copy full SHA for 9aad809

• better conflict handling [contributed by @zbindenp]

  ohumbel

  committed
  64b2c3a

  Copy full SHA for 64b2c3a

Commits on Dec 4, 2015

• adjust comandline flags in existing unit tests

  ohumbel

  committed
  c0f16eb

  Copy full SHA for c0f16eb

• Merge branch 'gitignorequest' into acceptwithoutmerge

  ohumbel

  committed
  ed560ea

  Copy full SHA for ed560ea

Commits on Dec 7, 2015

• Merge branch 'develop' into acceptwithoutmerge

  ohumbel

  committed
  60df943

  Copy full SHA for 60df943

Commits on Dec 18, 2015

• use core.ignoreCase instead of core.ignorecase

  ohumbel

  committed
  dfa5570

  Copy full SHA for dfa5570

Commits on Dec 28, 2015

• Merge branch 'develop' into acceptwithoutmerge

  ohumbel

  committed
  7bfa29c

  Copy full SHA for 7bfa29c