Changeset 1167 for 1.8.3/trunk/win32

Timestamp:

12/28/07 19:57:17 (1 year ago)

Author:

shawnw

Message:

Merge devel into trunk for p6 release

Files:

• 1.8.3/trunk/win32/cmds.h (modified) (1 diff)
• 1.8.3/trunk/win32/confmagic.h (modified) (1 diff)
• 1.8.3/trunk/win32/funs.h (modified) (1 diff)

1.8.3/trunk/win32/cmds.h

@@ -75 +75 @@
-COMMAND_PROTO(cmd_malias);
-COMMAND_PROTO(cmd_map);
+COMMAND_PROTO(cmd_message);
-COMMAND_PROTO(cmd_motd);
-COMMAND_PROTO(cmd_mvattr);

1.8.3/trunk/win32/confmagic.h

@@ -13 +13 @@
-#define _confmagic_h_
-
-
+
+
+
- * (which isn't exportable from the U.S.), then don't encrypt
- */

1.8.3/trunk/win32/funs.h

@@ -200 +200 @@
-FUNCTION_PROTO(fun_member);
-FUNCTION_PROTO(fun_merge);
+FUNCTION_PROTO(fun_message);
-FUNCTION_PROTO(fun_mid);
-FUNCTION_PROTO(fun_min);