l10n daemon script 5614a32d5c SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2019-05-03 08:53:24 +02:00
..
lib	SideBarManager: Clear active sidebar upon close	2019-04-21 11:21:29 +02:00
main	Fix location of Info.plist file for macOS build	2018-06-27 17:41:44 +02:00
plugins	VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts	2019-04-20 19:26:00 +02:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-03 08:53:24 +02:00
CMakeLists.txt	Add example hellopython Python extension	2018-02-26 18:18:56 +01:00
Messages.sh	Also skip scripts in src/Messages.sh	2018-03-09 09:13:10 +01:00