summaryrefslogtreecommitdiff
path: root/res/res_calendar.c
diff options
context:
space:
mode:
authorMatthew Nicholson <mnicholson@digium.com>2011-03-04 19:38:59 +0000
committerMatthew Nicholson <mnicholson@digium.com>2011-03-04 19:38:59 +0000
commitf6c2ebff45deaba14e450c09c6deb9d9500c88a2 (patch)
tree5c303bba55d56c1d0f33ae5bc102ffd95112f095 /res/res_calendar.c
parent3ef45303e13ca300a92dc6ead0720f87528330e9 (diff)
Merged revisions 309585 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r309585 | mnicholson | 2011-03-04 13:38:25 -0600 (Fri, 04 Mar 2011) | 9 lines Merged revisions 309584 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r309584 | mnicholson | 2011-03-04 13:37:13 -0600 (Fri, 04 Mar 2011) | 2 lines Restore mysterious lua_pushvalue() call removed in r309494. The mystery has been solved. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309587 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_calendar.c')
0 files changed, 0 insertions, 0 deletions