[atomix: 4/4] Merge branch 'wip/gtk3-port'
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atomix: 4/4] Merge branch 'wip/gtk3-port'
- Date: Sat, 17 Jan 2015 21:10:30 +0000 (UTC)
commit ab7efec177d93d0c53687d365e8dc182b8a9e0ed
Merge: c35f5ed 0d04816
Author: Robert Roth <robert roth off gmail com>
Date: Sat Jan 17 23:09:49 2015 +0200
Merge branch 'wip/gtk3-port'
configure.ac | 4 +-
data/Makefile.am | 2 +-
data/ui/Makefile.am | 5 +
data/ui/interface.ui | 381 ++++++++++++++++++++++++++++++++++++++++++++++++++
po/POTFILES.in | 4 +-
src/main.c | 228 ++++++++++--------------------
src/main.h | 2 +
7 files changed, 470 insertions(+), 156 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]