Grammalecte  Check-in [f387617c76]

Overview
Comment:[core][js] helpers: merge conflict
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | core
Files: files | file ages | folders
SHA3-256: f387617c76543d8c6e3ed33e025f826cae8cbd4d7d2b1906ca205803a9b2a911
User & Date: olr on 2017-07-29 07:59:59
Other Links: manifest | tags
Context
2017-07-31
04:55
[fx][core][js] WebExtension: merge with 0053e9898b check-in: a43bd18afb user: olr tags: trunk, fx
2017-07-29
07:59
[core][js] helpers: merge conflict check-in: f387617c76 user: olr tags: trunk, core
07:32
[fr] phonet_simil: nouvelles entrées check-in: c207e9c291 user: olr tags: trunk, fr
Changes

Modified gc_core/js/helpers.js from [726b7e9abe] to [da0905c944].

88
89
90
91
92
93
94

95
96
97
98
88
89
90
91
92
93
94
95
96
97

98







+


-



if (typeof(exports) !== 'undefined') {
    exports.setLogOutput = setLogOutput;
    exports.echo = echo;
    exports.logerror = logerror;
    exports.inspect = inspect;
    exports.loadFile = loadFile;
    exports.objectToMap = objectToMap;
    exports.mapToObject = mapToObject;
    exports.loadFile = loadFile;
}