Merge

- Added support for URIs - Added push command (pushes *.data to remote location) - Added config option: merge.autopush
2010-09-02 01:26:55 +02:00
parent d362088305
commit 869655e818
8 changed files with 85 additions and 5 deletions
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -99,6 +99,7 @@
 #define CMD_CONFIG              230
 #define CMD_SHOW                231
 #define CMD_MERGE               232
+#define CMD_PUSH                233

 // 3xx Attributes
 #define ATT_PROJECT             300