Michael Stapelberg 0148dc6fd3 Merge branch 'master' into next ...

Conflicts:
	src/commands.c

2015-03-07 15:57:41 +01:00

..

assignments.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00

bindings.c

Fix bindings using Mode_switch

2015-03-07 14:52:32 +01:00

click.c

Handle button release events

2015-02-10 17:46:02 -05:00

commands_parser.c

Bugfix: use the command parser to properly extract workspace names

2014-10-01 22:50:48 +02:00

commands.c

Properly error out when the layout file cannot be read.

2015-03-07 15:57:05 +01:00

con.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

config_directives.c

Merge branch 'master' into next

2015-01-31 22:56:08 +01:00

config_parser.c

Allow to validate the config file without X.

2014-08-25 19:34:26 +02:00

config.c

bugfix: copy binding before run

2014-11-16 23:36:27 +01:00

debug.c

format **/*.c with clang-format-3.5

2014-06-15 19:07:02 +02:00

display_version.c

format **/*.c with clang-format-3.5

2014-06-15 19:07:02 +02:00

ewmh.c

Support _NET_WM_MOVERESIZE

2015-02-11 00:07:28 +01:00

fake_outputs.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00

floating.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

handlers.c

Merge branch 'master' into next

2015-03-07 14:52:39 +01:00

i3.mk

cleanup: src/i3.mk: add XKB_COMMON_CFLAGS when compiling i3

2014-06-25 17:58:16 +02:00

ipc.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

key_press.c

Feature: implement mouse bindings

2014-06-19 12:28:54 +02:00

load_layout.c

Merge branch 'master' into next

2015-01-31 22:42:54 +01:00

log.c

format **/*.c with clang-format-3.5

2014-06-15 19:07:02 +02:00

main.c

Fix keyboard layout change detection

2015-03-03 09:47:15 +01:00

Makefile

Add stub Makefiles to allow subdir make calls

2012-07-22 19:57:48 +02:00

manage.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

match.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00

move.c

Include workspace con in workspace event

2014-12-22 09:47:31 +01:00

output.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00

randr.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00

regex.c

use I3__FILE__ for DLOG, leave __FILE__ as is

2012-08-12 12:19:47 +02:00

render.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

resize.c

format **/*.c with clang-format-3.5

2014-06-15 19:07:02 +02:00

restore_layout.c

Merge branch 'master' into next

2015-03-07 15:40:59 +01:00

scratchpad.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00

sd-daemon.c

format **/*.c with clang-format-3.5

2014-06-15 19:07:02 +02:00

sighandler.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

startup.c

Fix start_application() doc about which shell is used

2014-12-22 09:48:03 +01:00

tree.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

util.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

window.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

workspace.c

Include workspace con in workspace event

2014-12-22 09:47:31 +01:00

x.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

xcb.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

xcursor.c

run clang-format (3.5.0)

2015-03-01 17:16:03 +01:00

xinerama.c

clang-format-3.5 **/*.h **/*.c

2014-06-19 11:20:32 +02:00