Conflicts:
        library/adodb
        library/phpmailer

Whats with the git conflicts?

Should probably try to keep conflicts out of the final repository


On Wed, Oct 30, 2013 at 10:36 PM, GitHub <noreply@github.com> wrote:
  Branch: refs/heads/master
  Home:   https://github.com/mantisbt/mantisbt
  Commit: 132e1d2a1d2a8fe9a41803fe090973f36d8e6c7d
      https://github.com/mantisbt/mantisbt/commit/132e1d2a1d2a8fe9a41803fe090973f36d8e6c7d
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M core/icon_api.php

  Log Message:
  -----------
  icon_api: added missing $t_status_icon_arr

Conflicts:
        library/adodb
        library/phpmailer


  Commit: 95d4ac31d5b346afa25f4e4f109a7dba0a6f1bca
      https://github.com/mantisbt/mantisbt/commit/95d4ac31d5b346afa25f4e4f109a7dba0a6f1bca
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M core/user_api.php

  Log Message:
  -----------
  user_api: fix typos and incorrect argument count

It should be $t_last_timestamp_threshold not $c_last_timestamp_threshold
and although it probably would be a good idea to use a seed,
auth_generate_unique_cookie_string() doesn't actually take one.

Conflicts:
        core/user_api.php
        library/adodb
        library/phpmailer


  Commit: ca15c2e93248691bcbf7c053679653eff1dc7c5b
      https://github.com/mantisbt/mantisbt/commit/ca15c2e93248691bcbf7c053679653eff1dc7c5b
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M bug_monitor_list_view_inc.php

  Log Message:
  -----------
  Don't try to output result of print_user()

Conflicts:
        library/adodb
        library/phpmailer


  Commit: 7e25153e0c824424ffbf5d7356a938de8608c55b
      https://github.com/mantisbt/mantisbt/commit/7e25153e0c824424ffbf5d7356a938de8608c55b
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M signup_page.php

  Log Message:
  -----------
  Fix invocation of print_captcha_input() with too many arguments

Conflicts:
        library/adodb
        library/phpmailer
        signup_page.php


  Commit: 6dd8ad33b866877a044cf89d17e247e2b11b2314
      https://github.com/mantisbt/mantisbt/commit/6dd8ad33b866877a044cf89d17e247e2b11b2314
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M core/plugin_api.php

  Log Message:
  -----------
  Fix invocation of plugin_pop_current() with wrong number of arguments

Conflicts:
        library/adodb
        library/phpmailer


  Commit: 19c0ab51c5d107baf8d5646948e82dbf9cc7b4ac
      https://github.com/mantisbt/mantisbt/commit/19c0ab51c5d107baf8d5646948e82dbf9cc7b4ac
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M core/version_api.php

  Log Message:
  -----------
  Fix invocation of db_param() with incorrect number of arguments

Conflicts:
        core/version_api.php
        library/adodb
        library/phpmailer


  Commit: ac4c08900e4b639475ddc841d66bdf2c26efb4df
      https://github.com/mantisbt/mantisbt/commit/ac4c08900e4b639475ddc841d66bdf2c26efb4df
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M bug_view_inc.php

  Log Message:
  -----------
  Fix invocation of prepare_version_string() with incorrect number of arguments

Conflicts:
        bug_view_inc.php
        library/adodb
        library/phpmailer


  Commit: 7732085e65a50b3e46ae07705eb9ce08e9652d01
      https://github.com/mantisbt/mantisbt/commit/7732085e65a50b3e46ae07705eb9ce08e9652d01
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M core/helper_api.php

  Log Message:
  -----------
  Correct invocation of user_pref_get() with incorrect number of arguments

Conflicts:
        library/adodb
        library/phpmailer


  Commit: 9a003ee6a8f3c6021470020e49b3970a251f0ba9
      https://github.com/mantisbt/mantisbt/commit/9a003ee6a8f3c6021470020e49b3970a251f0ba9
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M account_page.php

  Log Message:
  -----------
  Fix invocation of user_get_email() with incorrect number of arguments

Conflicts:
        account_page.php
        library/adodb
        library/phpmailer


  Commit: 3a5ee877a2ef57370ce25a5c88bd43b041f9c979
      https://github.com/mantisbt/mantisbt/commit/3a5ee877a2ef57370ce25a5c88bd43b041f9c979
  Author: Rasmus Lerdorf <rasmus@php.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M adm_config_report.php
    M bugnote_view_inc.php
    M manage_user_page.php
    M print_bugnote_inc.php

  Log Message:
  -----------
  Don't try to output return value of print_* functions

These functions don't return anything

Conflicts:
        adm_config_report.php
        library/adodb
        library/phpmailer
        manage_user_page.php


Compare: https://github.com/mantisbt/mantisbt/compare/536b4083ef8e...3a5ee877a2ef

------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
mantisbt-cvs mailing list
mantisbt-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mantisbt-cvs