Permalink
Commits on Jul 8, 2017
  1. bump UASF version to 1.0

    mkwia committed Jul 8, 2017
  2. add knots-esque ua comment (#35)

    mkwia committed Jul 8, 2017
  3. Merge branch 'luke-jr-uasfsegwit+bip148_test' into 0.14-BIP148

    mkwia committed Jul 8, 2017
  4. Merge branch 'uasfsegwit+bip148_test' of https://github.com/luke-jr/b…

    mkwia committed Jul 8, 2017
    …itcoin into luke-jr-uasfsegwit+bip148_test
  5. Merge branch 'luke-jr-whitelist_outgoing' into 0.14-BIP148

    mkwia committed Jul 8, 2017
  6. Merge branch 'whitelist_outgoing' of https://github.com/luke-jr/bitcoin

    mkwia committed Jul 8, 2017
    … into luke-jr-whitelist_outgoing
  7. Merge branch 'relax_invblk_punishment-0.14' of https://github.com/luk…

    mkwia committed Jul 8, 2017
    …e-jr/bitcoin into luke-jr-relax_invblk_punishment-0.14
Commits on Jul 2, 2017
  1. Merge branch 'luke-jr-uasfsegwit+svcbit' into 0.14-BIP148

    mkwia committed Jul 2, 2017
  2. Merge branch 'uasfsegwit+svcbit' of https://github.com/luke-jr/bitcoin

    mkwia committed Jul 2, 2017
    …into luke-jr-uasfsegwit+svcbit
  3. Merge branch 'luke-jr-uasfsegwit+rewind' into 0.14-BIP148

    mkwia committed Jul 2, 2017
  4. Merge branch 'uasfsegwit+rewind' of https://github.com/luke-jr/bitcoin

    mkwia committed Jul 2, 2017
    …into luke-jr-uasfsegwit+rewind
Commits on Jun 20, 2017
  1. Merge branch 'luke-jr-uasfsegwit+bips' into 0.14-BIP148

    mkwia committed Jun 20, 2017
  2. Merge branch 'uasfsegwit+bips' of https://github.com/luke-jr/bitcoin

    mkwia committed Jun 20, 2017
    …into luke-jr-uasfsegwit+bips
  3. Merge branch 'luke-jr-uasfsegwit+bip148opt' into 0.14-BIP148

    mkwia committed Jun 20, 2017
Commits on Jun 17, 2017
  1. Merge pull request #20 from bitcoin/0.14

    mkwia committed Jun 17, 2017
    Update to Core 0.14.2
Commits on Apr 22, 2017
Commits on Apr 10, 2017
  1. add uasf logic

    mkwia committed Apr 10, 2017