]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 378735,378748 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Wed, 9 Jan 2013 20:21:33 +0000 (20:21 +0000)
committerAutomerge script <automerge@asterisk.org>
Wed, 9 Jan 2013 20:21:33 +0000 (20:21 +0000)
commit2ba33b4c3a9a38f0379e29f17e3ac538d524ea9d
treee2b48642e2574c8e4b206dc311db12a40960a64c
parent2fa8cc3f51e518965b305b8e4a5d6a7118fa1c0b
Merged revisions 378735,378748 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r378735 | dlee | 2013-01-09 13:38:53 -0600 (Wed, 09 Jan 2013) | 13 lines

  Replace errant tabs with spaces in causes.h.

  (closes issue ASTERISK-20826)
  Reported by: snuffy
  Patches:
   notabs.dif uploaded by snuffy (license 5024)
  ........

  Merged revisions 378733 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 378734 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r378748 | dlee | 2013-01-09 14:12:00 -0600 (Wed, 09 Jan 2013) | 13 lines

  Move declaration of ast_regex_string_to_regex_pattern futher down strings.h.

  The prior location is before the declaration of struct ast_str, which causes
  compiler warnings.

  (closes issue ASTERISK-20852)
  Reported by: Pavel Troller
  Patches:
   strings.diff uploaded by Pavel Troller (license 6302)
  ........

  Merged revisions 378747 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/causes.h
include/asterisk/strings.h