[OpenSIPS-Devel] [OpenSIPS/opensips] 2cdf24: separate file for the original Makefile.conf

[Razvan Crainea]

  Branch: refs/heads/master
  Home:   https://github.com/OpenSIPS/opensips
  Commit: 2cdf24f3753e9af7b274cec8dec15e055e05f9e6
      https://github.com/OpenSIPS/opensips/commit/2cdf24f3753e9af7b274cec8dec15e055e05f9e6
  Author: Razvan Crainea <razvan at opensips.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M .gitignore
    M Makefile
    A Makefile.conf.template
    M Makefile.modules

  Log Message:
  -----------
  separate file for the original Makefile.conf

The original Makefile.conf is now found in Makefile.conf.template. This
prevents merge conflicts while updating the Makefile.conf


  Commit: 2055db5f2e555043757e18f1cb03af89d5ac8095
      https://github.com/OpenSIPS/opensips/commit/2055db5f2e555043757e18f1cb03af89d5ac8095
  Author: Razvan Crainea <razvan at opensips.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M menuconfig/commands.c
    M menuconfig/main.c
    M menuconfig/main.h
    M menuconfig/parser.c

  Log Message:
  -----------
  menuconfig reads from template if config does not exist


  Commit: 26d9adc5076fc1787c22a7b3c6065defeedd4537
      https://github.com/OpenSIPS/opensips/commit/26d9adc5076fc1787c22a7b3c6065defeedd4537
  Author: Razvan Crainea <razvan at opensips.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    R Makefile.conf

  Log Message:
  -----------
  removed Makfile.conf from versioning


Compare: https://github.com/OpenSIPS/opensips/compare/cbe8d242f497...26d9adc5076f