[asterisk-commits] trunk - r7348 in /trunk: ./ contrib/firmware/iax/iaxy.bin

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Dec  5 18:09:48 2005
New Revision: 7348

URL: http://svn.digium.com/view/asterisk?rev=7348&view=rev
Log:
Merged revisions 7345-7347 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7345 | kpfleming | 2005-12-05 18:02:08 -0600 (Mon, 05 Dec 2005) | 2 lines

set this file to binary mode, so it won't be mangled on export/checkout

........
r7346 | kpfleming | 2005-12-05 18:07:48 -0600 (Mon, 05 Dec 2005) | 2 lines

don't try to expand keywords in this file

........
r7347 | kpfleming | 2005-12-05 18:08:19 -0600 (Mon, 05 Dec 2005) | 2 lines

_really_ don't mess with line endings

........

Modified:
    trunk/   (props changed)
    trunk/contrib/firmware/iax/iaxy.bin   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec  5 18:09:48 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7340
+/branches/1.2:1-7347

Propchange: trunk/contrib/firmware/iax/iaxy.bin
            ('svn:eol-style' removed)

Propchange: trunk/contrib/firmware/iax/iaxy.bin
            ('svn:keywords' removed)

Propchange: trunk/contrib/firmware/iax/iaxy.bin
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: trunk/contrib/firmware/iax/iaxy.bin
------------------------------------------------------------------------------
    svn:needs-lock = *