diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-15 10:23:57 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-15 10:23:57 (GMT) |
| commit | de5b64206c94a987174b087dcac9732f2ab419d8 (patch) | |
| tree | 7a7b128ac223fd2488343263c5dfc6093ae9d651 | |
| parent | d6ae654c764f8b9771ef217f37aaea58ea9f21fc (diff) | |
| parent | 5ebc0c8212f762025cf6f42fad040cd04cb58ebd (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 581e0a4..7287eac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = bin data lib po shell sugar services bin_SCRIPTS = \ @@ -1,3 +1,5 @@ +Snapshot d93122bf5e + * #2751 Add keybindings for max/min brightness/volume Snapshot 040c94d181 |