diff options
author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
---|---|---|
committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /main/php_memory_streams.h | |
parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'main/php_memory_streams.h')
-rw-r--r-- | main/php_memory_streams.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h index 1f2bf6ae9..6b17dcaf8 100644 --- a/main/php_memory_streams.h +++ b/main/php_memory_streams.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_memory_streams.h 272374 2008-12-31 11:17:49Z sebastian $ */ +/* $Id: php_memory_streams.h 272370 2008-12-31 11:15:49Z sebastian $ */ #ifndef PHP_MEMORY_STREAM_H #define PHP_MEMORY_STREAM_H |