projects / asterisk/asterisk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 603bf53) | patch
Add automerge property back after conflict.
authorMark Michelson <mmichelson@digium.com>
Tue, 11 Dec 2012 21:52:09 +0000 (21:52 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 11 Dec 2012 21:52:09 +0000 (21:52 +0000)
commitf5e9cf5975cf8a58774579f126952be61beb0e54
treeab1796aeb12a5367d1c7e95332be610ef490a5a5tree | snapshot
parent603bf5301f3a950687e41d40eeb02870044f6d0bcommit | diff
Add automerge property back after conflict.

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configure diff | blob | history
configure.ac diff | blob | history
include/asterisk/autoconfig.h.in diff | blob | history
include/asterisk/uuid.h [new file with mode: 0644] blob
main/Makefile diff | blob | history
main/asterisk.c diff | blob | history
main/udptl.c diff | blob | history
main/uuid.c [new file with mode: 0644] blob
tests/test_uuid.c [new file with mode: 0644] blob
Mirror of the Asterisk Project (https://gerrit.asterisk.org)