[tmux/f13/master: 6/6] Merge branch 'master' into f13

[Filipe Rosset]

commit 7430bc67c15eb0b9fbba86dfa1de4db23f6d5fb6
Merge: bccca43 f9a85ab
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Fri Aug 6 01:07:23 2010 -0300

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	tmux.spec

 sources                                          |    4 +
 tmux-1.0-02_fix_wrong_location.diff              |   36 +++++-------
 tmux-1.0-03_proper_socket_handling.diff          |   65 ++++++----------------
 tmux-1.0-04_dropping_unnecessary_privileges.diff |   20 +++----
 tmux.spec                                        |   16 ++++-
 5 files changed, 60 insertions(+), 81 deletions(-)
---
diff --cc sources
index 0342f4b,5237073..83d95f3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +748fbe7bb5f86812e19bd6005ff21a5a  tmux-1.2.tar.gz
++=======
+ 96e60cb206de2db0610b9fb6a64c2251  tmux-1.3.tar.gz
++>>>>>>> master
diff --cc tmux.spec
index b0e3dea,248fcb6..cfc3585
--- a/tmux.spec
+++ b/tmux.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name:           tmux
++<<<<<<< HEAD
 +Version:        1.2
++=======
+ Version:        1.3
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        A terminal multiplexer
  
@@@ -63,6 -63,9 +67,12 @@@ getent group tmux >/dev/null || groupad
  %attr(775,root,tmux) %{_localstatedir}/run/tmux
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Mon Jul 19 2010 Sven Lankes <sven at lank.es> 1.3-1
+ - New upstream release
+ 
++>>>>>>> master
  * Sun Mar 28 2010 Sven Lankes <sven at lank.es> 1.2-1
  - New upstream release
  - rediff writehard patch