From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Thu, 10 Apr 2014 13:33:36 +0000 (+0200)
Subject: Merge branch 'master' of github.com:Nothing2Do/diary-mobile-android
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=3cb355772e72ffce737834e73ace838cfdc802b6;p=diary-mobile.git

Merge branch 'master' of github.com:Nothing2Do/diary-mobile-android

Conflicts:
	ui.sql
---

3cb355772e72ffce737834e73ace838cfdc802b6
diff --cc ui.sql
index 99ac388,60b8995..0000000
deleted file mode 100644,100644
--- a/ui.sql
+++ /dev/null
@@@ -1,20 -1,20 +1,0 @@@
--INSERT INTO ui (keyword, label, action) VALUES(?, ?, ?);
--begin$config$config
- begin$help$main help
 -begin$help$help
--config$max column$setint maxcolumn
--config$host$settext host
--config$port$setint port
--config$user$settext user
--config$password$settext pass
--config$database$settext database
--config$filesave$settext file
--config$SQLsettings$settext SQLsettings
--config$button$settext button
--config$download$settext download
--config$uploadDB$settext uploadRAW
--config$uploadUi$settext uploadUi
--config$start$settext start
--config$DB file$settext db
--config$restore DB$settext restore
--config$selectraw$settext selectraw
- main help$list of action$box set $1 $2, settext $1, setint $1, new $,new, setfile $1, box $, quit,
 -help$list of action$box set $1 $2, settext $1, setint $1, new $,new, setfile $1, box $, quit,