OSDN Git Service
(root)
/
swfed
/
swfed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98bfc80
54f809b
)
Merge remote-tracking branch 'upstream/master'
master
author
Yoshihiro Yamazaki
<yoya@awm.jp>
Tue, 22 Dec 2020 15:05:53 +0000
(
00:05
+0900)
committer
Yoshihiro Yamazaki
<yoya@awm.jp>
Tue, 22 Dec 2020 15:05:53 +0000
(
00:05
+0900)
1
2
src/php_swfed.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/php_swfed.h
index
86170e8
,
e1645f8
..
b0bb42a
---
1
/
src/php_swfed.h
---
2
/
src/php_swfed.h
+++ b/
src/php_swfed.h
@@@
-24,7
-24,7
+24,11
@@@
extern zend_module_entry swfed_module_entry;
#define phpext_swfed_ptr &swfed_module_entry
++<<<<<<< HEAD
+#define PHP_SWFED_VERSION "0.65a" /* Replace with version number for your extention */
++=======
+ #define PHP_SWFED_VERSION "1.01a" /* Replace with version number for your extention */
++>>>>>>> upstream/master
#ifdef PHP_WIN32
#define PHP_SWFED_API __declspec(dllexport)