Merge branch 'master' into f18

Conflicts: .gitignore sources
weston 1.0.3
2013-02-21 12:51:15 -05:00 · 2013-01-02 17:23:11 -05:00
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,5 @@
 /weston-0.95.0.tar.xz
 /weston-0.99.0.tar.xz
 /weston-1.0.0.tar.xz
+/weston-1.0.3.tar.xz
 /weston-1.0.5.tar.xz
Author	SHA1	Message	Date
Adam Jackson	5113e8e69a	Merge branch 'master' into f18 Conflicts: .gitignore sources	2013-02-21 12:51:15 -05:00
Adam Jackson	df2c198bdb	weston 1.0.3	2013-01-02 17:23:11 -05:00