Merge command

* Renamed command _merge into merge
This commit is contained in:
Johannes Schlatow 2010-08-07 17:50:02 +02:00
parent b8a3c1b565
commit 7294869d07
4 changed files with 6 additions and 5 deletions

View file

@ -98,6 +98,7 @@
#define CMD_SHELL 229
#define CMD_CONFIG 230
#define CMD_SHOW 231
#define CMD_MERGE 232
// 3xx Attributes
#define ATT_PROJECT 300