diff options
author | Treeve Jelbert | 2012-02-15 16:01:53 +0100 |
---|---|---|
committer | Treeve Jelbert | 2012-02-15 16:01:53 +0100 |
commit | 92b637be8909ed51f5f901aa95cf6491883a63ff (patch) | |
tree | 538ca1b64fff6f8ef0b76a43bcaf08b2efe1b861 /ChangeLog | |
parent | b942161ad377e4ca709007a7ff67cc4cea9e1acf (diff) | |
parent | a2382adbb50df1e89f93e5518bb76ec81b70fc01 (diff) |
Merge branch 'devel-llvm-3.0' into devel-xorg-modular
Conflicts:
ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,3 +1,6 @@ +2012-02-15 Treeve Jelbert <treeve@sourcemage.org> + * xorg-lib/wayland: new compositor libary + 2012-02-11 Ladislav Hagara <hgr@vabo.cz> * devel/nodejs: new spell platform for building fast, scalable network applications |