Commit graph

140 commits

Author SHA1 Message Date
Simon McVittie
2e23700b39 NEWS 2012-02-08 19:13:19 +00:00
Simon McVittie
2a8be5a2f5 Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2012-02-08 19:06:51 +00:00
Simon McVittie
a9e14209a2 NEWS 2012-02-08 19:06:30 +00:00
Simon McVittie
3d29eaaf89 NEWS 2012-02-07 16:09:21 +00:00
Simon McVittie
7eca1ce532 NEWS 2012-02-07 15:21:45 +00:00
Simon McVittie
b816cb6e90 NEWS 2012-01-23 12:03:20 +00:00
Simon McVittie
6175893100 Merge branch 'dbus-1.4', rejecting commit 08dd53c14b 2012-01-23 10:33:35 +00:00
Simon McVittie
5480536c0b update NEWS 2012-01-23 10:20:54 +00:00
Simon McVittie
68ecce599a Merge branch 'dbus-1.4' 2012-01-04 18:15:39 +00:00
Simon McVittie
99bd4a517a NEWS so far 2012-01-04 17:52:14 +00:00
Simon McVittie
5df8c3db12 Revert all changes since a36d4918a6
Someone seems to have merged part of master into 1.4. Again. Let's go
back to the "last known good" point (the branch-point of some 1.4
branches I had locally), then we can cherry-pick the changes that
should have gone in.
2012-01-04 17:44:23 +00:00
Simon McVittie
8acd2e2148 Micro version 2011-09-21 19:39:18 +01:00
Simon McVittie
e24b3f1dba Prepare version 1.5.8 2011-09-21 18:26:29 +01:00
Simon McVittie
bf3d8259ac Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-09-21 11:39:32 +01:00
Simon McVittie
bdfec55054 NEWS 2011-09-21 11:38:22 +01:00
Simon McVittie
4dd6abc953 NEWS 2011-09-21 11:25:48 +01:00
Simon McVittie
2eddc3265c Merge branch 'dbus-1.4' 2011-08-24 11:26:13 +01:00
Simon McVittie
8c2ab410fb NEWS 2011-08-24 11:26:01 +01:00
Simon McVittie
6d4fe188e5 Merge branch 'dbus-1.4' 2011-08-15 10:26:48 +01:00
Simon McVittie
9929df06bf NEWS 2011-08-15 10:26:42 +01:00
Simon McVittie
21947eb371 NEWS 2011-08-12 10:45:24 +01:00
Simon McVittie
c99a3df254 Merge branch 'dbus-1.4' 2011-08-12 10:26:13 +01:00
Simon McVittie
486c0373f1 NEWS 2011-08-12 10:26:04 +01:00
Simon McVittie
0611a71c67 Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-08-11 11:54:52 +01:00
Simon McVittie
0b9e2b8b49 NEWS for 1.4.x 2011-08-11 11:53:45 +01:00
Simon McVittie
82495f4b40 Merge branch 'dbus-1.4' and update NEWS further 2011-08-05 15:07:24 +01:00
Simon McVittie
2a6c14cd2e NEWS 2011-08-05 15:03:39 +01:00
Simon McVittie
affd8a7d16 spec v0.18 and D-Bus 1.5.6 2011-07-29 16:46:38 +01:00
Simon McVittie
7c15271a17 1.4.14 2011-07-29 14:28:54 +01:00
Simon McVittie
fe5b9d3eac NEWS for 1.5 2011-07-29 13:43:09 +01:00
Simon McVittie
3c4b38b4ba Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-07-29 12:52:32 +01:00
Simon McVittie
bae9bb547f NEWS 2011-07-29 12:51:42 +01:00
Simon McVittie
6ca26b7700 Merge branch 'dbus-1.4'
Conflicts:
	dbus/dbus-message.c
2011-07-26 18:00:57 +01:00
Simon McVittie
104dc9383c NEWS 2011-07-26 17:59:23 +01:00
Simon McVittie
0a6e7cb982 Merge branch 'dbus-1.4' 2011-07-26 11:51:13 +01:00
Simon McVittie
b0f3874970 NEWS 2011-07-26 11:51:04 +01:00
Simon McVittie
feb31a3321 Merge branch 'dbus-1.4' and update NEWS for master
Conflicts:
	NEWS
2011-07-18 19:42:35 +01:00
Simon McVittie
006dbd48fa NEWS 2011-07-18 19:33:00 +01:00
Simon McVittie
5e7824729d NEWS 2011-06-13 16:54:00 +01:00
Simon McVittie
a2e330980d bump version 2011-06-13 10:32:30 +01:00
Simon McVittie
d28c80cf8d ahem. 2011-06-10 23:47:33 +01:00
Simon McVittie
eee95a83f8 Prepare 1.5.4 2011-06-10 22:59:26 +01:00
Simon McVittie
166bed249d Merge branch 'dbus-1.4'
Conflicts:
	NEWS
	configure.ac
2011-06-10 22:46:42 +01:00
Simon McVittie
5bfe1310c4 version bump 2011-06-10 22:45:46 +01:00
Simon McVittie
78ba729412 prepare 1.4.12 2011-06-10 21:56:16 +01:00
Simon McVittie
c83287898c Merge branch 'dbus-1.4' 2011-06-10 18:52:07 +01:00
Simon McVittie
5b68cf3ed9 NEWS 2011-06-10 18:52:01 +01:00
Simon McVittie
963a38d0b1 Merge branch 'dbus-1.4' 2011-06-08 11:38:21 +01:00
Simon McVittie
73e259322d NEWS 2011-06-08 11:35:22 +01:00
Simon McVittie
a09de5c004 Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-06-07 14:37:30 +01:00