Thomas Tuegel
|
7027f7df7c
|
kde5.spectacle: propagate all buildInputs
|
2016-04-30 12:20:49 -05:00 |
|
Thomas Tuegel
|
fa410d5ba1
|
kde5.print-manager: propagate all buildInputs
|
2016-04-30 12:20:49 -05:00 |
|
Thomas Tuegel
|
a5aaea3fb5
|
kde5.libkipi: propagate all buildInputs
|
2016-04-30 12:20:49 -05:00 |
|
Thomas Tuegel
|
3c6065bc5b
|
kde5.libkexiv2: propagate all buildInputs
|
2016-04-30 12:20:48 -05:00 |
|
Thomas Tuegel
|
6d74e3a619
|
kde5.libkdcraw: propagate all buildInputs
|
2016-04-30 12:20:48 -05:00 |
|
Thomas Tuegel
|
6c721ce849
|
kde5.konsole: propagate all buildInputs
|
2016-04-30 12:20:48 -05:00 |
|
Thomas Tuegel
|
1e5bee0b23
|
kde5.kio-extras: propagate all buildInputs
|
2016-04-30 12:20:47 -05:00 |
|
Thomas Tuegel
|
303071c14c
|
kde5.kdenetwork-filesharing: propagate all buildInputs
|
2016-04-30 12:20:47 -05:00 |
|
Thomas Tuegel
|
e14c14e6b9
|
kde5.kdegraphics-thumbnailers: propagate all buildInputs
|
2016-04-30 12:20:47 -05:00 |
|
Thomas Tuegel
|
6cef508a39
|
kde5.kcolorchooser: propagate all buildInputs
|
2016-04-30 12:20:47 -05:00 |
|
Thomas Tuegel
|
d3b1d5740e
|
kde5.kcalc: propagate buildInputs
|
2016-04-30 12:20:46 -05:00 |
|
Thomas Tuegel
|
fa758af5d8
|
kde5.kate: propagate all buildInputs
|
2016-04-30 12:20:46 -05:00 |
|
Thomas Tuegel
|
fd129bd97a
|
kde5.gwenview: propagate all buildInputs
|
2016-04-30 12:20:46 -05:00 |
|
Thomas Tuegel
|
fc6606adaf
|
kde5.gpgmepp: propagate all buildInputs
|
2016-04-30 12:20:45 -05:00 |
|
Thomas Tuegel
|
1ebcb5f67f
|
kde5.filelight: propagate all buildInputs
|
2016-04-30 12:20:45 -05:00 |
|
Thomas Tuegel
|
d4819465d8
|
kde5.ffmpegthumbs: propagate all buildInputs
|
2016-04-30 12:20:45 -05:00 |
|
Thomas Tuegel
|
aa8d8addeb
|
kde5.dolphin-plugins: propagate all buildInputs
|
2016-04-30 12:20:44 -05:00 |
|
Thomas Tuegel
|
a742a3e98f
|
kde5.dolphin: propagate all buildInputs
|
2016-04-30 12:20:44 -05:00 |
|
Thomas Tuegel
|
a2e4821311
|
kde5.baloo-widgets: propagate all buildInputs
|
2016-04-30 12:20:44 -05:00 |
|
Thomas Tuegel
|
16ab749298
|
kde5.ark: propagate all buildInputs
|
2016-04-30 12:20:44 -05:00 |
|
Thomas Tuegel
|
fd272ea970
|
kde5.systemsettings: propagate all buildInputs
|
2016-04-30 12:20:43 -05:00 |
|
Thomas Tuegel
|
a196901566
|
pkgs/desktops/kde-5/plasma-5.6: remove obsolete setup-hook.sh
|
2016-04-30 12:20:43 -05:00 |
|
Thomas Tuegel
|
d4842648ce
|
kde5.powerdevil: propagate buildInputs
|
2016-04-30 12:20:43 -05:00 |
|
Thomas Tuegel
|
758e28728e
|
kde5.polkit-kde-agent: propagate all buildInputs
|
2016-04-30 12:20:42 -05:00 |
|
Thomas Tuegel
|
ee5cc8f5ce
|
kde5.plasma-pa: propagate all buildInputs
|
2016-04-30 12:20:42 -05:00 |
|
Thomas Tuegel
|
a022895db1
|
kde5.plasma-nm: propagate all buildInputs
|
2016-04-30 12:20:42 -05:00 |
|
Thomas Tuegel
|
9f0feebeeb
|
kde5.plasma-mediacenter: propagate all buildInputs
|
2016-04-30 12:20:42 -05:00 |
|
Thomas Tuegel
|
747daca407
|
kde5.plasma-desktop: propagate all buildInputs
|
2016-04-30 12:20:41 -05:00 |
|
Thomas Tuegel
|
cfc28505b5
|
kde5.oxygen: propagate all buildInputs
|
2016-04-30 12:20:41 -05:00 |
|
Thomas Tuegel
|
8fb25cb4c2
|
kde5.milou: propagate all buildInputs
|
2016-04-30 12:20:41 -05:00 |
|
Thomas Tuegel
|
5addd165de
|
kde5.libksysguard: propagate all buildInputs
|
2016-04-30 12:20:40 -05:00 |
|
Thomas Tuegel
|
56dd0c2541
|
kde5.libkscreen: propagate all buildInputs
|
2016-04-30 12:20:40 -05:00 |
|
Thomas Tuegel
|
0dc8b5f32c
|
kde5.kwrited: propagate all buildInputs
|
2016-04-30 12:20:40 -05:00 |
|
Thomas Tuegel
|
e4d3699976
|
kde5.kwin: propagate all buildInputs
|
2016-04-30 12:20:39 -05:00 |
|
Thomas Tuegel
|
27aca6670c
|
kde5.kwayland: propagate all buildInputs
|
2016-04-30 12:20:39 -05:00 |
|
Thomas Tuegel
|
bb74e9afa5
|
kde5.ksysguard: propagate all buildInputs
|
2016-04-30 12:20:39 -05:00 |
|
Thomas Tuegel
|
b63b3485a0
|
kde5.ksshaskpass: propagate all buildInputs
|
2016-04-30 12:20:38 -05:00 |
|
Thomas Tuegel
|
483ed9427f
|
kde5.kscreen: propagate all buildInputs
|
2016-04-30 12:20:38 -05:00 |
|
Thomas Tuegel
|
21710ee012
|
kde5.kscreenlocker: propagate all buildInputs
|
2016-04-30 12:20:38 -05:00 |
|
Thomas Tuegel
|
289e0bab8e
|
kde5.kmenuedit: propagate all buildInputs
|
2016-04-30 12:20:38 -05:00 |
|
Thomas Tuegel
|
a9c93158f2
|
kde5.kinfocenter: propagate all buildInputs
|
2016-04-30 12:20:37 -05:00 |
|
Thomas Tuegel
|
e3e387f5bd
|
kde5.khotkeys: propagate buildInputs
|
2016-04-30 12:20:37 -05:00 |
|
Thomas Tuegel
|
188ad5dbb6
|
kde5.khelpcenter: propagate all buildInputs
|
2016-04-30 12:20:37 -05:00 |
|
Thomas Tuegel
|
b6aeb8e011
|
kde5.kdeplasma-addons: propagate all buildInputs
|
2016-04-30 12:20:36 -05:00 |
|
Thomas Tuegel
|
a43ef07c72
|
kde5.kde-gtk-config: propagate all buildInputs
|
2016-04-30 12:20:36 -05:00 |
|
Thomas Tuegel
|
9b5161e3aa
|
kde5.kde-cli-tools: propagate all buildInputs
|
2016-04-30 12:20:36 -05:00 |
|
Thomas Tuegel
|
3f4e8ab467
|
kde5.breeze-qt5: propagate all buildInputs
|
2016-04-30 12:20:35 -05:00 |
|
Thomas Tuegel
|
ff7c15b41d
|
kde5.bluedevil: propagate all buildInputs
|
2016-04-30 12:20:35 -05:00 |
|
Thomas Tuegel
|
3f753a655d
|
kde5.kservice: add patch to increase buffer size
Fixes #15044.
|
2016-04-30 12:20:34 -05:00 |
|
Thomas Tuegel
|
6d01760dd4
|
kde5.threadweaver: propagate buildInputs
|
2016-04-30 12:20:34 -05:00 |
|
Thomas Tuegel
|
c78bae87ce
|
kde5.sonnet: propagate all buildInputs
|
2016-04-30 12:20:34 -05:00 |
|
Thomas Tuegel
|
e5eada7ab8
|
kde5.solid: propagate all buildInputs
|
2016-04-30 12:20:33 -05:00 |
|
Thomas Tuegel
|
5698bb9c73
|
kde5.plasma-framework: propagate all buildInputs
|
2016-04-30 12:20:33 -05:00 |
|
Thomas Tuegel
|
c79a6ae2ac
|
kde5.oxygen-icons5: propagate all buildInputs
|
2016-04-30 12:20:33 -05:00 |
|
Thomas Tuegel
|
fbd7c269d1
|
kde5.networkmanager-qt: propagate all buildInputs
|
2016-04-30 12:20:32 -05:00 |
|
Thomas Tuegel
|
a630b4ec57
|
kde5.modemmanager-qt: propagate all buildInputs
|
2016-04-30 12:20:32 -05:00 |
|
Thomas Tuegel
|
02f34bbcbc
|
kde5.kxmlrpcclient: propagate all buildInputs
|
2016-04-30 12:20:32 -05:00 |
|
Thomas Tuegel
|
b8b755a869
|
kde5.kxmlgui: propagate all buildInputs
|
2016-04-30 12:20:31 -05:00 |
|
Thomas Tuegel
|
48f4e043f4
|
kde5.kwindowsystem: propagate all buildInputs
|
2016-04-30 12:20:31 -05:00 |
|
Thomas Tuegel
|
7ab37acfce
|
kde5.kwidgetsaddons: propagate all buildInputs
|
2016-04-30 12:20:31 -05:00 |
|
Thomas Tuegel
|
b0cfdf77ef
|
kde5.kwallet: propagate all buildInputs
|
2016-04-30 12:20:31 -05:00 |
|
Thomas Tuegel
|
7bda979a1a
|
kde5.kunitconversion: propagate all buildInputs
|
2016-04-30 12:20:30 -05:00 |
|
Thomas Tuegel
|
fd26b47be4
|
kde5.ktextwidgets: propagate all buildInputs
|
2016-04-30 12:20:30 -05:00 |
|
Thomas Tuegel
|
ce8f20ff0a
|
kde5.ktexteditor: propagate all buildInputs
|
2016-04-30 12:20:30 -05:00 |
|
Thomas Tuegel
|
de14d68984
|
kde5.kservice: propagate all buildInputs
|
2016-04-30 12:20:29 -05:00 |
|
Thomas Tuegel
|
ca55273431
|
kde5.krunner: propagate buildInputs
|
2016-04-30 12:20:29 -05:00 |
|
Thomas Tuegel
|
29b2d93bbf
|
kde5.kross: propagate all buildInputs
|
2016-04-30 12:20:29 -05:00 |
|
Thomas Tuegel
|
86d9ef9c0f
|
kde5.kpty: propagate all buildInputs
|
2016-04-30 12:20:29 -05:00 |
|
Thomas Tuegel
|
0d01e89a19
|
kde5.kplotting: propagate all buildInputs
|
2016-04-30 12:20:28 -05:00 |
|
Thomas Tuegel
|
aa8d2d180d
|
kde5.kpeople: propagate all buildInputs
|
2016-04-30 12:20:28 -05:00 |
|
Thomas Tuegel
|
6a235b3e7f
|
kde5.kparts: propagate all buildInputs
|
2016-04-30 12:20:28 -05:00 |
|
Thomas Tuegel
|
5a4f8bb04b
|
kde5.kpackage: propagate all buildInputs
|
2016-04-30 12:20:27 -05:00 |
|
Thomas Tuegel
|
de47317ef2
|
kde5.knotifyconfig: propagate all buildInputs
|
2016-04-30 12:20:27 -05:00 |
|
Thomas Tuegel
|
35692118cd
|
kde5.knotifications: propagate all buildInputs
|
2016-04-30 12:20:27 -05:00 |
|
Thomas Tuegel
|
3cfdad0a9a
|
kde5.knewstuff: propagate all buildInputs
|
2016-04-30 12:20:26 -05:00 |
|
Thomas Tuegel
|
40786c0990
|
kde5.kmediaplayer: propagate all buildInputs
|
2016-04-30 12:20:26 -05:00 |
|
Thomas Tuegel
|
7490f3662c
|
kde5.kjsembed: propagate all buildInputs
|
2016-04-30 12:20:26 -05:00 |
|
Thomas Tuegel
|
27078990f9
|
kde5.kjs: propagate all buildInputs
|
2016-04-30 12:20:25 -05:00 |
|
Thomas Tuegel
|
4e983f65b9
|
kde5.kjobwidgets: propagate all buildInputs
|
2016-04-30 12:20:25 -05:00 |
|
Thomas Tuegel
|
f4a5078245
|
kde5.kitemviews: propagate all buildInputs
|
2016-04-30 12:20:25 -05:00 |
|
Thomas Tuegel
|
83fff10a66
|
kde5.kitemmodels: propagate all buildInputs
|
2016-04-30 12:20:25 -05:00 |
|
Thomas Tuegel
|
6c103125db
|
kde5.kio: propagate all buildInputs
|
2016-04-30 12:20:24 -05:00 |
|
Thomas Tuegel
|
c9202600fa
|
kde5.kinit: propagate all buildInputs
|
2016-04-30 12:20:24 -05:00 |
|
Thomas Tuegel
|
4986a452e6
|
kde5.kimageformats: propagate all buildInputs
|
2016-04-30 12:20:24 -05:00 |
|
Thomas Tuegel
|
6187ae6c02
|
kde5.kidletime: propagate all buildInputs
|
2016-04-30 12:20:23 -05:00 |
|
Thomas Tuegel
|
22300d7c59
|
kde5.kiconthemes: propagate all buildInputs
|
2016-04-30 12:20:23 -05:00 |
|
Thomas Tuegel
|
ad2671f73c
|
kde5.ki18n: propagate all buildInputs
|
2016-04-30 12:20:23 -05:00 |
|
Thomas Tuegel
|
670123464b
|
kde5.khtml: propagate all buildInputs
|
2016-04-30 12:20:22 -05:00 |
|
Thomas Tuegel
|
7689b8317e
|
kde5.kguiaddons: propagate all buildInputs
|
2016-04-30 12:20:22 -05:00 |
|
Thomas Tuegel
|
f3bf03250e
|
kde5.kglobalaccel: propagate all buildInputs
|
2016-04-30 12:20:22 -05:00 |
|
Thomas Tuegel
|
0e94f26382
|
kde5.kfilemetadata: propagate all buildInputs
|
2016-04-30 12:20:22 -05:00 |
|
Thomas Tuegel
|
9f9ab4aa25
|
kde5.kemoticons: propagate all buildInputs
|
2016-04-30 12:20:21 -05:00 |
|
Thomas Tuegel
|
e7f42467e3
|
kde5.kdoctools: propagate all buildInputs
|
2016-04-30 12:20:21 -05:00 |
|
Thomas Tuegel
|
f8c5148825
|
kde5.kdnssd: propagate all buildInputs
|
2016-04-30 12:20:21 -05:00 |
|
Thomas Tuegel
|
1acadc2255
|
kde5.kdewebkit: propagate all buildInputs
|
2016-04-30 12:20:20 -05:00 |
|
Thomas Tuegel
|
e6a1d1c3d0
|
kde5.kdesu: propagate all buildInputs
|
2016-04-30 12:20:20 -05:00 |
|
Thomas Tuegel
|
be1091d46c
|
kde5.kdesignerplugin: propagate all buildInputs
|
2016-04-30 12:20:20 -05:00 |
|
Thomas Tuegel
|
f60d19ba86
|
kde5.kded: propagate all buildInputs
|
2016-04-30 12:20:19 -05:00 |
|
Thomas Tuegel
|
99c50e45c7
|
kde5.kdeclarative: propagate all buildInputs
|
2016-04-30 12:20:19 -05:00 |
|
Thomas Tuegel
|
d1ec927a09
|
kde5.kcrash: propagate all buildInputs
|
2016-04-30 12:20:19 -05:00 |
|
Thomas Tuegel
|
2c0231e0b0
|
kde5.kcoreaddons: propagate all buildInputs
|
2016-04-30 12:20:19 -05:00 |
|
Thomas Tuegel
|
1f27e8cfd5
|
kde5.kconfigwidgets: propagate all buildInputs
|
2016-04-30 12:20:18 -05:00 |
|
Thomas Tuegel
|
db7c96221f
|
kde5.kcompletion: propagate all buildInputs
|
2016-04-30 12:20:18 -05:00 |
|
Thomas Tuegel
|
d7e71a3a1c
|
kde5.kcmutils: propagate all buildInputs
|
2016-04-30 12:20:18 -05:00 |
|
Thomas Tuegel
|
5fe38a707b
|
kde5.kbookmarks: propagate all buildInputs
|
2016-04-30 12:20:17 -05:00 |
|
Thomas Tuegel
|
44da4d92e3
|
kde5.kauth: propagate all buildInputs
|
2016-04-30 12:20:17 -05:00 |
|
Thomas Tuegel
|
55a6f79164
|
kde5.karchive: propagate all buildInputs
|
2016-04-30 12:20:16 -05:00 |
|
Thomas Tuegel
|
634b995589
|
kde5.kapidox: propagate all buildInputs
|
2016-04-30 12:20:16 -05:00 |
|
Thomas Tuegel
|
a1d47d0f15
|
kde5.kactivities: propagate all buildInputs
|
2016-04-30 12:20:15 -05:00 |
|
Thomas Tuegel
|
ff846b3dc1
|
kde5.kactivities-stats: propagate all buildInputs
|
2016-04-30 12:20:15 -05:00 |
|
Thomas Tuegel
|
b4a4fa4bc6
|
kde5.frameworkintegration: propagate all buildInputs
|
2016-04-30 12:20:15 -05:00 |
|
Thomas Tuegel
|
5560c4a28b
|
kde5.breeze-icons: propagate all buildInputs
|
2016-04-30 12:20:15 -05:00 |
|
Thomas Tuegel
|
068bbfa22d
|
kde5.bluez-qt: propagate all buildInputs
|
2016-04-30 12:20:14 -05:00 |
|
Thomas Tuegel
|
ff87134c91
|
kde5.plasma-framework: remove patches
|
2016-04-30 12:20:14 -05:00 |
|
Thomas Tuegel
|
01e82f9256
|
kde5.kfilemetadata propagate all buildInputs
|
2016-04-30 12:20:13 -05:00 |
|
Thomas Tuegel
|
e5274b2fee
|
kde5.kdelibs4support: propagate all buildInputs
|
2016-04-30 12:20:13 -05:00 |
|
Thomas Tuegel
|
3a948d4786
|
kde5.baloo: propagate all buildInputs
|
2016-04-30 12:20:13 -05:00 |
|
Thomas Tuegel
|
0e660bf27f
|
kde5.plasma-workspace: wrap Qt programs
|
2016-04-30 12:20:12 -05:00 |
|
Thomas Tuegel
|
2272ef7299
|
kde5.plasma-workspace: propagate all buildInputs
|
2016-04-30 12:20:12 -05:00 |
|
Thomas Tuegel
|
5c7783427c
|
extra-cmake-modules: assume propagatedBuildInputs
The KDE build system assumes buildInputs = propagatedBuildInputs.
|
2016-04-30 12:20:12 -05:00 |
|
Tuomas Tynkkynen
|
4ff8f377af
|
Merge remote-tracking branch 'upstream/master' into staging
|
2016-04-28 00:13:53 +03:00 |
|
Nikolay Amiantov
|
dfe608c8a2
|
symlinkJoin: accept set as an argument with additional options
|
2016-04-26 15:37:42 +03:00 |
|
Thomas Tuegel
|
a2e40003a1
|
kde5_latest -> kde5
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
5896befee0
|
nixos/kde5: install kactivitymanagerd
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
99c06657df
|
kde5_latest.kdeplasma-addons: add plasma-workspace input
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
ffc217883c
|
kde5_latest.plasma-workspace: remove patches
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
62945ebaba
|
kde5_latest.libksysguard: remove patch now included upstream
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
b61cf16942
|
kde5_latest.libkscreen: remove patches
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
19474a7b2a
|
kde5_latest.knotifications: include optional libdbusmenu input
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
c7f0701c87
|
kde5_latest.plasma: 5.5.5 -> 5.6.3
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
3dded2e72a
|
kde5_latest.applications: 15.12.03 -> 16.04.0
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
eb604134f7
|
kde5_latest.frameworks: 5.19 -> 5.21
|
2016-04-25 19:04:24 -05:00 |
|
Thomas Tuegel
|
7cc52a65b0
|
kde5.kconfigwidgets: remove runtime perl dependency
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
fc45aaafa6
|
kde5.extra-cmake-modules: do not propagate build inputs for docs
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
3d05424dc2
|
kde5.plasma-workspace: fix up dependencies
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
f418bd2dfa
|
kde5.startkde: fix PATH
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
2780894b1b
|
kde5.startkde: init at 5.5.5
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
468d0bc56a
|
kde5.plasma-workspace: unwrap
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
afe5a05c93
|
kde5.kinit: get library path from NIX_PROFILES
|
2016-04-20 10:01:06 -05:00 |
|
Thomas Tuegel
|
c37c5d4b52
|
kde5.kcolorchooser: init at 15.12.3
|
2016-04-18 16:28:59 -05:00 |
|
Nikolay Amiantov
|
8b7ebaffeb
|
replace makeSearchPath tree-wise to take care of possible multiple outputs
|
2016-04-13 22:09:41 +03:00 |
|
Vladimír Čunát
|
ab15a62c68
|
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
|
2016-04-01 10:06:01 +02:00 |
|
Thomas Tuegel
|
13e83a493e
|
kde5.applications: 15.12.1 -> 15.12.3
|
2016-03-29 21:21:44 -05:00 |
|
Thomas Tuegel
|
350d196f7a
|
kwin: allow CMake to set RPATH during build
(cherry picked from commit 3ff6d0492a9fa939f559580dc841239a8f75142c)
|
2016-03-28 06:23:43 -05:00 |
|
Thomas Tuegel
|
0e5b441133
|
kde5.l10n.sr: patch shebangs
(cherry picked from commit cb9f989b18d32bfa1206d6091afbfaeff50fed28)
Signed-off-by: Domen Kožar <domen@dev.si>
|
2016-03-27 21:44:08 +01:00 |
|
Thomas Tuegel
|
6bcee1d9b2
|
kde5.l10n.nl: re-enable
(cherry picked from commit e81ee2be29e92599f568681e3a9601d356ff8892)
Signed-off-by: Domen Kožar <domen@dev.si>
|
2016-03-27 21:44:03 +01:00 |
|
Thomas Tuegel
|
c0c2be83a3
|
kde5.plasma-workspace: move kbuildsycoca5 earlier in startkde
|
2016-03-11 08:48:10 -06:00 |
|
Thomas Tuegel
|
cb1b4e803d
|
kde5.kcalc: add gmp dependency
|
2016-03-09 06:49:44 -06:00 |
|
Thomas Tuegel
|
1d5a9c0fab
|
kde5: fix merge conflicts from master
The last merge from master into closure-size obliterated all my
closure-size fixes for KDE 5! Luckily, I had them backed-up in another
branch.
|
2016-03-09 06:49:44 -06:00 |
|
Vladimír Čunát
|
09af15654f
|
Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
|
2016-03-08 09:58:19 +01:00 |
|