[svn-commits] file: trunk r2298 - /trunk/

[svn-commits at lists.digium.com]

Author: file
Date: Thu Mar  8 10:00:29 2007
New Revision: 2298

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2298
Log:
Blocked revisions 2297 via svnmerge

................
r2297 | file | 2007-03-08 10:58:10 -0500 (Thu, 08 Mar 2007) | 10 lines

Merged revisions 2296 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2296 | file | 2007-03-08 10:56:05 -0500 (Thu, 08 Mar 2007) | 2 lines

vprintk is only available on 2.6.9+ (issue #9232 reported by baconbuttie)

........

................

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-blocked (original)
+++ branch-1.4-blocked Thu Mar  8 10:00:29 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1889,2271
+/branches/1.4:1889,2271,2297