Unity Greeter

Merge lp:~mterry/unity-greeter/modelines into lp:unity-greeter

  1. modelines
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Robert Ancell
Approved revision: 240
Merged at revision: 240
Proposed branch: lp:~mterry/unity-greeter/modelines
Merge into: lp:unity-greeter
Diff against target: 61 lines (+12/-2)
6 files modified
Makefile.am (+2/-0)
configure.ac (+2/-0)
data/Makefile.am (+2/-0)
src/Makefile.am (+2/-0)
src/unity-greeter.vala (+2/-1)
src/user-list.vala (+2/-1)
To merge this branch: bzr merge lp:~mterry/unity-greeter/modelines
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+88021@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2011-07-11 07:36:57 +0000
3+++ Makefile.am 2012-01-10 09:42:24 +0000
4@@ -1,3 +1,5 @@
5+# -*- Mode: Automake; indent-tabs-mode: t; tab-width: 4 -*-
6+
7 SUBDIRS = data po src
8
9 EXTRA_DIST = \
10
11=== modified file 'configure.ac'
12--- configure.ac 2011-11-01 14:28:07 +0000
13+++ configure.ac 2012-01-10 09:42:24 +0000
14@@ -1,3 +1,5 @@
15+# -*- Mode: m4; indent-tabs-mode: nil; tab-width: 4 -*-
16+
17 dnl Process this file with autoconf to produce a configure script.
18
19 AC_INIT(unity-greeter, 0.2.0~bzr)
20
21=== modified file 'data/Makefile.am'
22--- data/Makefile.am 2011-09-01 06:33:11 +0000
23+++ data/Makefile.am 2012-01-10 09:42:24 +0000
24@@ -1,3 +1,5 @@
25+# -*- Mode: Automake; indent-tabs-mode: t; tab-width: 4 -*-
26+
27 xgreeterdir = $(datarootdir)/xgreeters
28 dist_xgreeter_DATA = unity-greeter.desktop
29
30
31=== modified file 'src/Makefile.am'
32--- src/Makefile.am 2011-08-24 03:15:08 +0000
33+++ src/Makefile.am 2012-01-10 09:42:24 +0000
34@@ -1,3 +1,5 @@
35+# -*- Mode: Automake; indent-tabs-mode: t; tab-width: 4 -*-
36+
37 sbin_PROGRAMS = unity-greeter
38
39 unity_greeter_SOURCES = \
40
41=== modified file 'src/unity-greeter.vala'
42--- src/unity-greeter.vala 2011-12-09 18:06:18 +0000
43+++ src/unity-greeter.vala 2012-01-10 09:42:24 +0000
44@@ -1,4 +1,5 @@
45-/*
46+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
47+ *
48 * Copyright (C) 2011 Canonical Ltd
49 *
50 * This program is free software: you can redistribute it and/or modify
51
52=== modified file 'src/user-list.vala'
53--- src/user-list.vala 2011-12-09 18:06:18 +0000
54+++ src/user-list.vala 2012-01-10 09:42:24 +0000
55@@ -1,4 +1,5 @@
56-/*
57+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
58+ *
59 * Copyright (C) 2011 Canonical Ltd
60 *
61 * This program is free software: you can redistribute it and/or modify

Subscribers

People subscribed via source and target branches