Merge remote-tracking branch 'nocreeps/master'

diff --combined gdbinit
index 71e5ee87e541bc61426935da4b50cfbb9f1f3b12,82811ca74c3c5d9b977e0907febdcab90e1b6cd1..4fdd8e63d826206f13d228d30b9cdb59e8703d25
--- 1/gdbinit
--- 2/gdbinit
+++ b/gdbinit
@@@ -1,9 -1,24 +1,24 @@@
  # GDB (GNU debugger) configuration file.
  
+ # Copyright (C) 2011-2012  Simon Ruderich
+ #
+ # This file is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This file is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this file.  If not, see <http://www.gnu.org/licenses/>.
+ 
  
  # Save command history.
  set history save on
 -# And save 1024 entries.
 -set history size 1024
 +# And save more entries.
 +set history size 10000
  
  # vim: ft=gdb