]> git.sur5r.net Git - i3/i3/log
i3/i3
9 years agorelease.sh: add missing commit step for debian changelog
Michael Stapelberg [Thu, 16 Apr 2015 07:21:00 +0000 (09:21 +0200)]
release.sh: add missing commit step for debian changelog

9 years agorelease.sh: fix encoding and concatenating changelog
Michael Stapelberg [Thu, 16 Apr 2015 07:20:43 +0000 (09:20 +0200)]
release.sh: fix encoding and concatenating changelog

9 years agorelease.sh: set up master branch for pushing the website
Michael Stapelberg [Thu, 16 Apr 2015 07:20:22 +0000 (09:20 +0200)]
release.sh: set up master branch for pushing the website

9 years agorelease.sh: checkout correct branch before copying docs
Michael Stapelberg [Thu, 16 Apr 2015 07:19:46 +0000 (09:19 +0200)]
release.sh: checkout correct branch before copying docs

9 years agorelease.sh: 4.10.2 release
Michael Stapelberg [Thu, 16 Apr 2015 07:19:30 +0000 (09:19 +0200)]
release.sh: 4.10.2 release

9 years agodebian: update changelog
Michael Stapelberg [Thu, 16 Apr 2015 07:08:46 +0000 (09:08 +0200)]
debian: update changelog

9 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 16 Apr 2015 07:03:28 +0000 (09:03 +0200)]
Merge branch 'master' into next

9 years agoMerge branch 'release-4.10.2'
Michael Stapelberg [Thu, 16 Apr 2015 07:03:28 +0000 (09:03 +0200)]
Merge branch 'release-4.10.2'

9 years agorelease i3 4.10.2 4.10.2
Michael Stapelberg [Thu, 16 Apr 2015 07:02:58 +0000 (09:02 +0200)]
release i3 4.10.2

9 years agoMerge pull request #1654 from Deiz/complete-run-chdir
Michael Stapelberg [Sun, 12 Apr 2015 17:46:54 +0000 (10:46 -0700)]
Merge pull request #1654 from Deiz/complete-run-chdir

Allow complete-run.pl to be run from any directory

9 years agoAllow complete-run.pl to be run from any directory 1654/head
Deiz [Sat, 11 Apr 2015 22:52:47 +0000 (18:52 -0400)]
Allow complete-run.pl to be run from any directory

9 years agoMerge pull request #1641 from Deiz/fix-1640
Michael Stapelberg [Sun, 12 Apr 2015 17:08:43 +0000 (10:08 -0700)]
Merge pull request #1641 from Deiz/fix-1640

Store Git commit identifier in its own object

9 years agoRebuild version.o when version.c or LAST_VERSION change 1641/head
Deiz [Tue, 7 Apr 2015 17:27:35 +0000 (13:27 -0400)]
Rebuild version.o when version.c or LAST_VERSION change

$(TOPDIR)/LAST_VERSION is a cached copy of common.mk's I3_VERSION var,
updated only if the two differ.

9 years agoMerge pull request #1652 from Airblader/fix-1649
Michael Stapelberg [Sun, 12 Apr 2015 16:27:02 +0000 (09:27 -0700)]
Merge pull request #1652 from Airblader/fix-1649

Removed comment on removal of legacy "default" layout.

9 years agoMerge pull request #1653 from nmikhailov/next
Michael Stapelberg [Sun, 12 Apr 2015 16:26:32 +0000 (09:26 -0700)]
Merge pull request #1653 from nmikhailov/next

Bump testsuite dependencies versions

9 years agoBump testsuite dependencies versions 1653/head
Nikita Mikhailov [Sat, 11 Apr 2015 11:00:57 +0000 (16:00 +0500)]
Bump testsuite dependencies versions

9 years agoRemoved comment on removal of legacy "default" layout. 1652/head
Ingo Bürk [Sat, 11 Apr 2015 08:27:42 +0000 (10:27 +0200)]
Removed comment on removal of legacy "default" layout.

closes #1649

9 years agoStore Git commit identifier in its own object
Deiz [Mon, 6 Apr 2015 22:28:40 +0000 (18:28 -0400)]
Store Git commit identifier in its own object

Fixes #1640

9 years agoBugfix: Remove windows from the save set when unmapping. sur5r.net/master
Michael Stapelberg [Mon, 6 Apr 2015 13:40:12 +0000 (15:40 +0200)]
Bugfix: Remove windows from the save set when unmapping.

fixes #1617

9 years agoUse a reasonable default sep_block_width if a separator_symbol is given
Ingo Bürk [Fri, 3 Apr 2015 20:54:59 +0000 (22:54 +0200)]
Use a reasonable default sep_block_width if a separator_symbol is given

9 years agoGet workspace name when renaming current workspace.
Michael Hofmann [Mon, 30 Mar 2015 06:23:00 +0000 (08:23 +0200)]
Get workspace name when renaming current workspace.

- fixes #1607

9 years agoCope with non-null-terminated x class properties.
Michael Hofmann [Sun, 29 Mar 2015 13:15:12 +0000 (15:15 +0200)]
Cope with non-null-terminated x class properties.

- fixes #1605

9 years agoBugfix: Remove windows from the save set when unmapping.
Michael Stapelberg [Mon, 6 Apr 2015 13:40:12 +0000 (15:40 +0200)]
Bugfix: Remove windows from the save set when unmapping.

fixes #1617

9 years agoMerge pull request #1634 from Airblader/feature-sep-symbol-default
Michael Stapelberg [Sat, 4 Apr 2015 16:08:28 +0000 (09:08 -0700)]
Merge pull request #1634 from Airblader/feature-sep-symbol-default

Use a reasonable default sep_block_width if a separator_symbol is given

9 years agoUse a reasonable default sep_block_width if a separator_symbol is given 1634/head
Ingo Bürk [Fri, 3 Apr 2015 20:54:59 +0000 (22:54 +0200)]
Use a reasonable default sep_block_width if a separator_symbol is given

9 years agoMerge pull request #1631 from Airblader/bug-1629
Michael Stapelberg [Thu, 2 Apr 2015 20:15:28 +0000 (13:15 -0700)]
Merge pull request #1631 from Airblader/bug-1629

Allow --whole-window right after 'bindsym' within binding modes

9 years agoAdded testcases for --whole-window in a binding inside a mode (#1629) 1631/head
Ingo Bürk [Thu, 2 Apr 2015 09:17:29 +0000 (11:17 +0200)]
Added testcases for --whole-window in a binding inside a mode (#1629)

9 years agoAllow --whole-window right after 'bindsym' within binding modes
Ingo Bürk [Wed, 1 Apr 2015 21:13:25 +0000 (23:13 +0200)]
Allow --whole-window right after 'bindsym' within binding modes

fixes #1629

9 years agoMerge pull request #1628 from acrisci/feature/complete-run-coverage
Michael Stapelberg [Thu, 2 Apr 2015 07:33:05 +0000 (00:33 -0700)]
Merge pull request #1628 from acrisci/feature/complete-run-coverage

complete-run: add coverage report generation

9 years agoMerge pull request #1630 from Deiz/consistent-mouse-actions
Michael Stapelberg [Thu, 2 Apr 2015 07:09:13 +0000 (00:09 -0700)]
Merge pull request #1630 from Deiz/consistent-mouse-actions

Make floating window mouse handling consistent with tiled windows

9 years agoMerge pull request #1625 from Airblader/feature-docs
Michael Stapelberg [Thu, 2 Apr 2015 07:08:19 +0000 (00:08 -0700)]
Merge pull request #1625 from Airblader/feature-docs

Documentation Improvements

9 years agoMerge pull request #1624 from Airblader/feature-1058
Michael Stapelberg [Thu, 2 Apr 2015 06:56:06 +0000 (23:56 -0700)]
Merge pull request #1624 from Airblader/feature-1058

Position i3-input at window with input focus

9 years agoClarify that more than one atom is handled by i3 and describe briefly in which way. 1625/head
Ingo Bürk [Wed, 1 Apr 2015 15:46:20 +0000 (17:46 +0200)]
Clarify that more than one atom is handled by i3 and describe briefly in which way.

9 years agoUpdate docs to clarify that split containers get a representation of their children...
Ingo Bürk [Wed, 1 Apr 2015 15:45:53 +0000 (17:45 +0200)]
Update docs to clarify that split containers get a representation of their children in the decoration

9 years agoReworded the documentation slightly and fixed the link to correctly point to Github.
Ingo Bürk [Wed, 1 Apr 2015 15:47:38 +0000 (17:47 +0200)]
Reworded the documentation slightly and fixed the link to correctly point to Github.

9 years agoUpdate the definition of the workspace spec and describe it.
Ingo Bürk [Wed, 1 Apr 2015 15:47:17 +0000 (17:47 +0200)]
Update the definition of the workspace spec and describe it.

9 years agoUpdate documentation to state that the configuration file is read by the custom parse...
Ingo Bürk [Wed, 1 Apr 2015 15:46:53 +0000 (17:46 +0200)]
Update documentation to state that the configuration file is read by the custom parser as well.

9 years agoMake floating window mouse handling consistent with tiled windows 1630/head
Deiz [Wed, 1 Apr 2015 20:17:26 +0000 (16:17 -0400)]
Make floating window mouse handling consistent with tiled windows

It seems that this was the intended behaviour all along, according to
the comments.

9 years agoPosition i3-input at window with input focus 1624/head
Ingo Bürk [Wed, 1 Apr 2015 12:35:49 +0000 (14:35 +0200)]
Position i3-input at window with input focus

This positions the i3-input window at the window holding the input focus' position, plus a small offset.

fixes #1058

9 years agoMerge pull request #1621 from Airblader/feature-1416
Michael Stapelberg [Thu, 2 Apr 2015 06:35:03 +0000 (23:35 -0700)]
Merge pull request #1621 from Airblader/feature-1416

Added no_focus directive

9 years agoDocument test coverage reporting for testcases 1628/head
Tony Crisci [Wed, 1 Apr 2015 22:19:18 +0000 (18:19 -0400)]
Document test coverage reporting for testcases

9 years agomakefile: allow COVERAGE to be configurable
Tony Crisci [Wed, 1 Apr 2015 21:36:32 +0000 (17:36 -0400)]
makefile: allow COVERAGE to be configurable

If COVERAGE=1 during build, i3 will be compiled for coverage testing.

9 years agocomplete-run: add coverage report generation
Tony Crisci [Wed, 1 Apr 2015 19:10:27 +0000 (15:10 -0400)]
complete-run: add coverage report generation

When `complete-run.pl` is given `--coverage-testing`, try to generate an
html coverage testing report for the run. This requires i3 to be
compiled with coverage testing support.

9 years agoUpdates userguide for 'no_focus <criteria>' (#1416) 1621/head
Ingo Bürk [Wed, 1 Apr 2015 11:59:24 +0000 (13:59 +0200)]
Updates userguide for 'no_focus <criteria>' (#1416)

9 years agoAdded testcase for the no_focus directive (#1416)
Ingo Bürk [Tue, 31 Mar 2015 19:22:34 +0000 (21:22 +0200)]
Added testcase for the no_focus directive (#1416)

9 years agoAdded config directive 'no_focus <criteria>' (#1416)
Ingo Bürk [Sun, 29 Mar 2015 15:30:14 +0000 (17:30 +0200)]
Added config directive 'no_focus <criteria>' (#1416)

9 years agoAdded assignment type 'A_NO_FOCUS' (#1416)
Ingo Bürk [Sun, 29 Mar 2015 15:29:21 +0000 (17:29 +0200)]
Added assignment type 'A_NO_FOCUS' (#1416)

Any assignment with type 'A_NO_FOCUS' will cause the matched window to not be focused by i3 when it is managed.

9 years agoMerge pull request #1620 from Airblader/bug-1614
Michael Stapelberg [Wed, 1 Apr 2015 18:29:38 +0000 (11:29 -0700)]
Merge pull request #1620 from Airblader/bug-1614

Only allow unique marks (#1614)

9 years agoMerge pull request #1626 from acrisci/feature/remove-tests-dir
Michael Stapelberg [Wed, 1 Apr 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #1626 from acrisci/feature/remove-tests-dir

Remove unused `tests` dir

9 years agoRemove unused `tests` dir 1626/head
Tony Crisci [Wed, 1 Apr 2015 16:31:32 +0000 (12:31 -0400)]
Remove unused `tests` dir

9 years agoOnly mark a window if only one window is matched 1620/head
Ingo Bürk [Tue, 31 Mar 2015 18:47:22 +0000 (20:47 +0200)]
Only mark a window if only one window is matched

We only support unique marks, so looping over all matched windows must be prevented.
If more than one window is matched, we reject it with an error message.

fixes #1614

9 years agoAdded a testcase for #1614
Ingo Bürk [Tue, 31 Mar 2015 18:45:37 +0000 (20:45 +0200)]
Added a testcase for #1614

9 years agoMerge pull request #1618 from Deiz/fix-1603
Michael Stapelberg [Wed, 1 Apr 2015 07:08:22 +0000 (09:08 +0200)]
Merge pull request #1618 from Deiz/fix-1603

Allow single-child non-default layout cons to be moved between outputs

9 years agoAllow single-child non-default layout cons to be moved between outputs 1618/head
Deiz [Tue, 31 Mar 2015 17:29:43 +0000 (13:29 -0400)]
Allow single-child non-default layout cons to be moved between outputs

Includes a test case to verify the behaviour of 'move <direction>'.
Fixes #1603.

9 years agoMerge pull request #1601 from Airblader/feature-titlebar-marks
Michael Stapelberg [Mon, 30 Mar 2015 21:53:42 +0000 (23:53 +0200)]
Merge pull request #1601 from Airblader/feature-titlebar-marks

Show marks in the titlebar

9 years agoChanged the default for show_marks from "no" to "yes" 1601/head
Ingo Bürk [Mon, 30 Mar 2015 20:16:05 +0000 (22:16 +0200)]
Changed the default for show_marks from "no" to "yes"

9 years agoMake show_marks configurable
Ingo Bürk [Sat, 28 Mar 2015 23:26:49 +0000 (00:26 +0100)]
Make show_marks configurable

Introduce a config directive "show_marks [yes|no]" to en- or disable drawing marks on window decorations.
To not change the look & feel of existing configurations, the default is "no".

9 years agoIntroduce a cached boolean for changes to the mark of a window.
Ingo Bürk [Sat, 28 Mar 2015 23:13:44 +0000 (00:13 +0100)]
Introduce a cached boolean for changes to the mark of a window.
This is necessary to correctly redraw window decorations when the mark of
a window is added or removed.

9 years agoDraw marks in window decoration
Ingo Bürk [Sat, 28 Mar 2015 23:09:10 +0000 (00:09 +0100)]
Draw marks in window decoration

If a window has a mark set, e.g., "example", it will be printed on the right side of the window decorations.
The format is "[example]" and the name of the window is truncated if necessary.

Marks starting with an underscore ("_") will be ignored.

9 years agoMerge pull request #1613 from Airblader/feature-1426
Michael Stapelberg [Mon, 30 Mar 2015 20:58:16 +0000 (22:58 +0200)]
Merge pull request #1613 from Airblader/feature-1426

Added focus_on_window_activation directive

9 years agoMerge pull request #1609 from Deiz/consistent-center
Michael Stapelberg [Mon, 30 Mar 2015 20:54:56 +0000 (22:54 +0200)]
Merge pull request #1609 from Deiz/consistent-center

Handle floating centering in one function and test for consistency

9 years agoUpdated userguide for the directive focus_on_window_activation introduced in #1426. 1613/head
Ingo Bürk [Mon, 30 Mar 2015 20:05:51 +0000 (22:05 +0200)]
Updated userguide for the directive focus_on_window_activation introduced in #1426.

9 years agoAdded testcases for #1426
Ingo Bürk [Mon, 30 Mar 2015 20:08:02 +0000 (22:08 +0200)]
Added testcases for #1426

9 years agoAdded 'focus_on_window_activation' directive
Ingo Bürk [Mon, 30 Mar 2015 20:07:48 +0000 (22:07 +0200)]
Added 'focus_on_window_activation' directive

When a window receives a _NET_ACTIVE_WINDOW message, it can steal the focus. This may not be preferable to all users.
With this directive, the user can choose from one of the following:
1) 'smart' - focus the container if its workspace is visible, otherwise set the urgency flag (default)
2) 'urgent' - always set the urgency flag, do not steal focus
3) 'focus' - always switch focus, never set the urgency hint
4) 'none' - ignore the request entirely (do not switch focus, nor set the urgency hint)

fixes #1426

9 years agoHandle floating centering in one function and test for consistency 1609/head
Deiz [Mon, 30 Mar 2015 07:10:40 +0000 (03:10 -0400)]
Handle floating centering in one function and test for consistency

9 years agoMerge pull request #1608 from mh21/renaming-empty-ws-startup
Michael Stapelberg [Mon, 30 Mar 2015 20:01:18 +0000 (22:01 +0200)]
Merge pull request #1608 from mh21/renaming-empty-ws-startup

Update old_name when renaming current workspace

9 years agoMerge pull request #1611 from acrisci/bug/complete-run-pod-errors
Michael Stapelberg [Mon, 30 Mar 2015 19:24:48 +0000 (21:24 +0200)]
Merge pull request #1611 from acrisci/bug/complete-run-pod-errors

complete-run: fix pod errors

9 years agocomplete-run: fix pod errors 1611/head
Tony Crisci [Mon, 30 Mar 2015 15:04:45 +0000 (11:04 -0400)]
complete-run: fix pod errors

Close `=over` with `=back` and use ascii apostrophe for "don't" to avoid
pod errors on `complete-run` docs.

9 years agoMerge pull request #1604 from mh21/wm-class-garbage
Michael Stapelberg [Mon, 30 Mar 2015 07:12:25 +0000 (09:12 +0200)]
Merge pull request #1604 from mh21/wm-class-garbage

Cope with non-null-terminated x class properties.

9 years agoCope with non-null-terminated x class properties. 1604/head
Michael Hofmann [Sun, 29 Mar 2015 13:15:12 +0000 (15:15 +0200)]
Cope with non-null-terminated x class properties.

- fixes #1605

9 years agoTestcase for non-null-terminated WM_CLASS.
Michael Hofmann [Sun, 29 Mar 2015 16:52:03 +0000 (18:52 +0200)]
Testcase for non-null-terminated WM_CLASS.

- fails most of the time

9 years agoMerge pull request #1589 from Deiz/fix-center
Michael Stapelberg [Mon, 30 Mar 2015 06:47:04 +0000 (08:47 +0200)]
Merge pull request #1589 from Deiz/fix-center

Make center coordinates relative to current workspace

9 years agoMerge pull request #1588 from Deiz/xdg-wizard
Michael Stapelberg [Mon, 30 Mar 2015 06:38:58 +0000 (08:38 +0200)]
Merge pull request #1588 from Deiz/xdg-wizard

Respect XDG config directories in i3-config-wizard

9 years agoGet workspace name when renaming current workspace. 1608/head
Michael Hofmann [Mon, 30 Mar 2015 06:23:00 +0000 (08:23 +0200)]
Get workspace name when renaming current workspace.

- fixes #1607

9 years agoTestcase for #1607.
Michael Hofmann [Mon, 30 Mar 2015 06:22:03 +0000 (08:22 +0200)]
Testcase for #1607.

- crash in startup_sequence_rename_workspace because of NULL old_name

9 years agoRespect XDG config directories in i3-config-wizard 1588/head
Deiz [Thu, 26 Mar 2015 01:00:18 +0000 (21:00 -0400)]
Respect XDG config directories in i3-config-wizard

$XDG_CONFIG_HOME is used for the config's write path, and the wizard
terminates if a config is found in ~/.i3 or $XDG_CONFIG_HOME/i3

9 years agoMerge pull request #1606 from Deiz/libi3-mkdirp
Michael Stapelberg [Sun, 29 Mar 2015 21:36:28 +0000 (23:36 +0200)]
Merge pull request #1606 from Deiz/libi3-mkdirp

Move mkdirp into libi3

9 years agoMove mkdirp into libi3 1606/head
Deiz [Sun, 29 Mar 2015 21:18:00 +0000 (17:18 -0400)]
Move mkdirp into libi3

9 years agoMerge pull request #1595 from Deiz/fix-1484
Michael Stapelberg [Sun, 29 Mar 2015 21:14:37 +0000 (23:14 +0200)]
Merge pull request #1595 from Deiz/fix-1484

Fix percents when attaching a window to a ws creates a new split con

9 years agoMerge pull request #1599 from Airblader/feature-toggle-mark
Michael Stapelberg [Sun, 29 Mar 2015 21:02:27 +0000 (23:02 +0200)]
Merge pull request #1599 from Airblader/feature-toggle-mark

Added a --toggle switch to the mark command

9 years agoAdded test cases for 'mark --toggle' (#1463) 1599/head
Ingo Bürk [Sat, 28 Mar 2015 22:14:59 +0000 (23:14 +0100)]
Added test cases for 'mark --toggle' (#1463)

9 years agoUpdated docs for #1463
Ingo Bürk [Sat, 28 Mar 2015 18:12:31 +0000 (19:12 +0100)]
Updated docs for #1463

9 years agoAdded a --toggle switch to "mark [--toggle] <mark>"
Ingo Bürk [Sat, 28 Mar 2015 18:12:25 +0000 (19:12 +0100)]
Added a --toggle switch to "mark [--toggle] <mark>"

This option allows toggling marks on a window without knowing whether the mark is already set or not.
It behaves as follows:
1) If the matched window has no mark, the new mark is set.
2) If the matched window has another mark, the old mark is removed and the new mark is set.
3) If the matched window already has the mark, the mark is removed.

The behavior that all non-matched windows have this mark removed is kept.

fixes #1463

9 years agoinitialize variables to NULL to avoid invalid free() on error
Michael Stapelberg [Sun, 29 Mar 2015 18:57:20 +0000 (20:57 +0200)]
initialize variables to NULL to avoid invalid free() on error

9 years agoMerge pull request #1600 from Deiz/libi3
Michael Stapelberg [Sun, 29 Mar 2015 18:56:07 +0000 (20:56 +0200)]
Merge pull request #1600 from Deiz/libi3

Move resolve_tilde and get_config_path into libi3

9 years agoMove resolve_tilde and get_config_path into libi3 1600/head
Deiz [Sat, 28 Mar 2015 18:30:35 +0000 (14:30 -0400)]
Move resolve_tilde and get_config_path into libi3

9 years agoMerge pull request #1593 from Airblader/feature-nagbar-primary-output
Michael Stapelberg [Sun, 29 Mar 2015 17:54:32 +0000 (19:54 +0200)]
Merge pull request #1593 from Airblader/feature-nagbar-primary-output

Display i3-nagbar on primary output

9 years agoMerge pull request #1597 from Airblader/bug-1187
Michael Stapelberg [Sun, 29 Mar 2015 17:50:03 +0000 (19:50 +0200)]
Merge pull request #1597 from Airblader/bug-1187

Move urgency hint when moving container to another workspace

9 years agorelease.sh: add release announcement email to avoid mistakes
Michael Stapelberg [Sun, 29 Mar 2015 17:34:33 +0000 (19:34 +0200)]
release.sh: add release announcement email to avoid mistakes

9 years agorelease.sh: set up git remotes appropriately
Michael Stapelberg [Sun, 29 Mar 2015 17:22:29 +0000 (19:22 +0200)]
release.sh: set up git remotes appropriately

9 years agoupdate debian/changelog
Michael Stapelberg [Sun, 29 Mar 2015 17:10:41 +0000 (19:10 +0200)]
update debian/changelog

9 years agoMerge branch 'next' into master
Michael Stapelberg [Sun, 29 Mar 2015 17:07:24 +0000 (19:07 +0200)]
Merge branch 'next' into master

9 years agoMerge branch 'release-4.10.1'
Michael Stapelberg [Sun, 29 Mar 2015 17:07:24 +0000 (19:07 +0200)]
Merge branch 'release-4.10.1'

9 years agorelease i3 4.10.1 4.10.1
Michael Stapelberg [Sun, 29 Mar 2015 17:07:03 +0000 (19:07 +0200)]
release i3 4.10.1

9 years agoprepare release.sh for 4.10.1
Michael Stapelberg [Sun, 29 Mar 2015 16:51:04 +0000 (18:51 +0200)]
prepare release.sh for 4.10.1

9 years agorelease from “next”
Michael Stapelberg [Sun, 29 Mar 2015 16:50:00 +0000 (18:50 +0200)]
release from “next”

9 years agoMerge pull request #1592 from Deiz/xdg-wizard-font
Michael Stapelberg [Sun, 29 Mar 2015 16:53:31 +0000 (18:53 +0200)]
Merge pull request #1592 from Deiz/xdg-wizard-font

Make wizard window size and click coordinates dependent on font

9 years agoUpdate debian/changelog
Michael Stapelberg [Sun, 29 Mar 2015 16:08:59 +0000 (18:08 +0200)]
Update debian/changelog

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)]
Merge branch 'master' into next

9 years agoMerge branch 'release-4.10'
Michael Stapelberg [Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)]
Merge branch 'release-4.10'