labofsahil/github-event-dataset-2012 huggingface dataset:
Fix bugs where some surfaces weren't merged and others were counted as merged in R_MergeLeafSurfaces().

git-svn-id: svn://svn.icculus.org/quake3/trunk@2351 edf5b092-35ff-0310-97b2-ce42778d08ea
Various shader fixes and optimizations.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2352 edf5b092-35ff-0310-97b2-ce42778d08ea
Fix some "> MAX_*" to be ">= MAX_*".

git-svn-id: svn://svn.icculus.org/quake3/trunk@2353 edf5b092-35ff-0310-97b2-ce42778d08ea
Change error message in CL_ConfigstringModified to specify out of range index like in server.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2354 edf5b092-35ff-0310-97b2-ce42778d08ea
Fix follow command to find clients whose name begins with a number.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2355 edf5b092-35ff-0310-97b2-ce42778d08ea
- Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
- Add usage messages for gc, tell, vtell, and votell commands.
- Check player names in gc, tell, vtell, and votell commands.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2356 edf5b092-35ff-0310-97b2-ce42778d08ea
Remove anti tamper leftover code 'CL_ChangeReliableCommand'. From Ensiform.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2357 edf5b092-35ff-0310-97b2-ce42778d08ea
#5799 - Change messagemode text box to display colors like in console input box.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2358 edf5b092-35ff-0310-97b2-ce42778d08ea
Improve "play" command, based on a patch from Ensiform.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2359 edf5b092-35ff-0310-97b2-ce42778d08ea
Remove unneeded name buffer in S_Play_f.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2360 edf5b092-35ff-0310-97b2-ce42778d08ea
- Check for invalid filename in OpenAL's RegisterSound function.
- Changed Base sound system to warn not error when sound filename is empty or too long.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2361 edf5b092-35ff-0310-97b2-ce42778d08ea
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2362 edf5b092-35ff-0310-97b2-ce42778d08ea
Make software overbright optional (cvar r_softOverbright) and reduce the number of FBOs and FBO blits when able.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2363 edf5b092-35ff-0310-97b2-ce42778d08ea
Changes suggested by DevHC:
- Remove "!target" checks from tell, vtell, and gc commands. Target was just set, cannot be NULL.
- Validate "order" in gc command before "player id."

git-svn-id: svn://svn.icculus.org/quake3/trunk@2364 edf5b092-35ff-0310-97b2-ce42778d08ea
Update standalone code in Catch the Chicken NSIS installer.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2365 edf5b092-35ff-0310-97b2-ce42778d08ea
Remove unused function CL_DisconnectPacket. Pointed out by Ensiform.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2366 edf5b092-35ff-0310-97b2-ce42778d08ea
adding demo and src directories
Move Zsh terminal title config into a separate file.
Tweak comments.
this try catch is a poor man's patch for issue #630 see https://github.com/kennethreitz/requests/issues/630
Adds a new README file.
凌驾略有改动，修正情敌、守候、改造AI
dは潰しちゃだめなので.にした
Added clicking on map to start drawing
Fixed Pica Github link
Merge branch 'gruntjs' into gh-pages

* gruntjs:
  Fixed Pica Github link
Add a WDN plugin wrapper around the jQuery form validator plugin
Update the example to use the plugin.
Remove example async notice.
Merge pull request #291 from kabel/jquery-validation

Add a WDN plugin wrapper around the jQuery form validator plugin
Add rule actions
Fixed directory renamed - done by eyal
Paslėpti visi FIXME ir TODO.
Added more things to features section
Entries per page on search pages increased to 20
Add js routes
Merge branch 'master' of github.com:vessi/battle2012
More changes to requests flow
Create UILabel for author of book
Better support channel nick list

- add mutex for adding channels and queries to prevent race conditions
- add simple private message rendering
- use a model for channel nick list
- rearrange IrcMessage switch statements
Add NickListModel class, switch to ListView in ChannelTab

- use NickListModel in Channel
- handle join and part messages in Channel
- close Session when application quits
item equipping network sync
hotfixes from mail
path edit & repo
vgrn's first commit
vgrn's modification #2
HHKB를 위한 함수, 설정 추가, 기호/함수 하이라이트 변경.
vim: apk is also a zip file
Remove unnecessary test assert.
Fix degrade of tune page error.
Agrego y quito productos del carrito
log view and multiplayer chat
在此调整热部署策略
Adding hawk auth scheme
Merge branch 'develop' of git://github.com/walmartlabs/hapi into feature/hawk

Merging upstream
Fixing hawk issues
Merge pull request #282 from wpreul/feature/hawk

Adding hawk auth scheme
re-submodulized
ajust height done
Remove client from dependencies.
Bump version.
- Code re-organization
- Expand README documentation
Testing check in from Windows.
fresh installation from file system instead of master.sql
create default records after fresh installation from files
directory removed from filesystem for default records
default record creation script
Create GL Mapper through script
removed gl mapper files
Fixes in create_default_records
install from files done
global defaults entry
Renamed patch dir, new patch_list and update __patchlog patch
updated patchlog for first time
test cases for account creation
test cases company setup
merged scrap_msql with master
test cases added
test  cases for master records
utillity fn for testcases in super class TestBase
merged with master branch
merged with master branch
deleted sms code from sales order
always open links embedded in knowledge base answers in new tab
styled the container block type dialog and the form block type dialog
Changed core selection description
Changed ROM Author to WFSDEV
Updated credits section of aroma script
Fuuuuuuuuuuuuuuuuuuu
added function replacementPolicy() to VM kernel.  Added some comments to VMProcess indicating what needs to be done about a TLB Mill
Some more acknowledgements, before I forget.
make it possible to file bugs
Accept apiSecret also.
fix typo in name
Merge branch 'master' of github.com:williamstein/ant
don't reload page on form submission
Update to RSpec 2.12.0

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Teach wiki_append_sanitized_link_target to take a str_t

Rather than passing in a parser_t and assuming the text we want to
operate on is the one in the struct, pass in the link target str_t
explicitly. This added flexibility will make the
wiki_append_sanitized_link_target function suitable for wider use, which
I am presently going to do in order to fix a bug.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Simplify Wikitext_parser_sanitize_link_target

Commit 778839e made the wiki_append_sanitized_link_target function more
flexible by making it accept a str_t instead of a parser_t. This in turn
means that we can simplify the Wikitext_parser_sanitize_link_target
function; it can deal with a str_t directly rather than working with a
throwaway parser_t.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Move some functions around to avoid the forward declarations

In order to fix a bug I'm going to need to use
wiki_append_sanitized_link_target and, therefore, a couple of its
dependencies high up in the file.

Just move the functions up so as to avoid the need to make a forward
declaration.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Ensure ampersands in URIs are adequately entified

Fixes:

  https://wincent.com/issues/2010

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Adding /get_mission.  pep8 cleaning.
Limiting Theorem + Definition
air base stuff
(OK) version 1.00
pagination for categorize
Exercise 6 plus Extra Credit.
Exercise 7 plus Extra Credit.
Exercise 8 plus the Extra Credit.
Exercise 9 plus the Extra Credit.
Exercise 10 plus the Extra Credit.
did some of the TODOs, still modular issues
Dodanie systemu autoryzacji, rol, css
Initialised
Merge remote-tracking branch 'maevi/master'
added jsx completion
Add files, make some changes
added StateT
Merge branch 'master' of github.com:xdanx/le-cycling
primer commit
agregando aplicación que permite subir archivos por ajax
eliminando pyc
agregando un css con colores de bootstrap
mejorando el soporte de navbar desplazable
quitando jquery de dentro de boostrap
mejorando soport de navbar
moviendo template base de bootstrap
agregando una app para jquery
agregando la app library de sunshine
agregando aplicación cliente de library
agregando aplicación de spine
agregando app de procesamiento fuera de línea
agregando librería para ejecutar comandos en el sistema
agregando cliente de short
función global de autocompletado de búsquedas
agregando css de la página Home
agregando tempalte base
agregando template index
instalando aplicaciones nuevas
api change, bug fix, tests
testing
Merge github.com:xneox/spring-mvc
xray cromer-lib calc -- allow single values as well as arrays
fix errors in get_dll() for windows and py2exe
small fix to get_dll()
updated py2exe_build script
Merge branch 'master' of https://github.com/xraypy/xraylarch
gray line right beow the top menu is removed
Fix styles
Add UI touches
removed console.log
fixed callback on success in apiCall()
fixed this scope in initGames() and fixed bug in gamePoints()
fixed this scope in uploadGames()
added link to online version of app
add the GPUImageView mirror feature
bug fix in alpha for fillRect
adding html unit tests
implementing style manager
removed xml parser class now that it is standard in haxe 2.10
moved resize to document
bug fixes when setting innerhtml on the html element
Added ContextPath Annotation and per domain Request Handler.
Check for "Change Login Name" parameter to prevent unsetting username
big changes in class

development
Class refactoring.
Separate liqRibMeshData and liqAreaLightData.
liqAreaLightData, liqRibSubdivisionData derived from liqRibMeshData
liqRibHierarchicalSubdivisionData derived from liqRibSubdivisionData.
liqRibMayaSubdivisionData derived from liqRibHierarchicalSubdivisionData.
Add attributes supported in command line to RenderGlobals.
Changing vim theme and iterm2 themes
Merge branch 'master' of github.com:ymiyata/dotfiles
Many fixes on .vimrc
Added jquery and slidercss
red is green
christmas eve post
add vundle submodule
update vundle
fix UserJSONImplTest.testProfileImageURL corruption
fix corrupted list test cases
highlight text on hover, less inline functions
trying to move about text into home page with a partial
Redirect to the dashboard for invalid searches.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
git: add hub helper
hack bootstrap-typeahead.js
update
Merge branch 'master' of https://github.com/zople/365Project.git
update
Merge branch 'master' of https://github.com/zople/365Project.git
new file:   crm.conf
	new file:   update_hosts
加入读写文件流的功能
Fixed a small bug in the Date Chart generation.
add borqs
Cambios en css y nuevos themes
commiting James patch for exposing remaining silence hits
Revert "Include the build pusher in the title"

This reverts commit 6cbaee2c38c93acb9b119cbad4d54340c71d868e.
finetuning the upgrade property names
modify git-who and add name
Some gps bug fix
Merge pull request #212 from Kenny9999/KennyAQDevelopment

Some gps bug fix
Added the seed admin and the seed project.
Removed Gemlock
adding net45 as a symbol in netversion
add build scripts for easy use. one for getting xbmc build deps, one for compile
fixed small mistake made by me
Merge branch 'master' of github.com:AlexsJones/jnxlib
extended the list of colour defines a bit
mapping
Merge branch 'master' of https://github.com/AlibabaTech/druid
Fix paypal failing tests
updated
Updated accordingly to @davehunt's comments
removed unused _logo_locator
Readded logo_locator and modified wait method accordingly
Base.search_for now returns the right results page
fix stray test
Updated _paypal_login_dialog_locator
Refactor no_restart to avoid implicit wait
Merge pull request #514 from zacc/no_restart_implicit_wt

Refactor no_restart to avoid implicit wait
Merge pull request #513 from AlinT/fix_paypal_fails

Fix paypal failing tests
make result() and results() work for collections and personas
Merge remote branch 'upstream/master' into refactor_search_for
fix mbrandt's nit
Xfailed failing tests due to new bug
Merge pull request #518 from AlinT/xfail_profile_tests

Xfailed failing tests due to new bug
removing test parameterization from this pull
removing test parameterization from this pull

this push technically adds a test case where you search from extensions
from the extensions page rather than from the home page.
Remove test_that_extension_is_underlined_while_hover_and_text_not
as decided by Krupa and Stephen.
Removed test_that_all_category_links_work and test_cadegory.py
since there was only this test in the file.
Also removed the page objects that depended on it.
Reflections only
Single reflexion fix
Merge pull request #7 from raphaelbastide/patch-1

Patch 1
Timetable editing kinda works for Classes
pursure++
Added functions show() and hide()
Base functionality of the Linker

Connection with the TextBoxes is implemented
Fixed for IE support

Object 'console' not exists in IE
Unit test corrections. Fixes bug 996255.

Change-Id: I6cf0a8ef2fa41a0d69042fe53d08b6d29ae8afdc
pastis.rb 12/06/2012
test2

test2
bla

bla
bla2

bla2
Adding duplicate-key tests to abstract.class.datastore.paged.L5 unit tests
All abstract.class.datastore.paged.L5 add[x]() and add[x]_multi() unit tests now pass duplicate item tests
Read-Write Debugged 1
Implement API for ItemFrames
[ADD] Updated Milton to 1.7.2

1.6.5 is no longer available in the milton repo at http://www.ettrema.com/maven2/com/ettrema/milton-api/

This is untested, yet the code compiles ;-)
Merge pull request #55 from micheee/update-milton

[ADD] Updated Milton to 1.7.2
changed bashrc folder
tracking bashrc in the right folder
Animate new chat messages
Companies form added, insert already working. Edit and deleting under development
mom-28 Add new diagnostics
mom-28 Add zero_coriolis_bt namelist option
adds bind_node api command
Defconfig for CM
set 'first' to true if no releases *before* this one
Set 'first' to true if no releases *before* this one, fixes #235
Changed the tructure and added time and location handling.
Added the ParseException.
label halo increased by 0.5
row options new open effect + new position when row is last available
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
style wizard icons changed
added change message
added change message
INIT CSS commit
SpaceAfterCommaRule (partial)
minor tweaks, add examples.rst
radians :D
ej4 topic 3
Added some notes.
1. new created markdown note
2. shell commend `tr`
3. new created URLs note
appstats tracking
Updating readme for 1.4.1
Added tests to validate user model is functioning correctly
font stil pa slider text
songs/_form
add award backend
deprecated duplicate method in downloadManager
Fix: avoid warning with php 5.4
[ bug #464 ] Payment form should allow to add transmitter for bank transfers
Fix: getDirList is ambiguous, this method can return dir list or files
list. Method is renamed to "getNodesList"
Fix: Use order date for stats, not valid date.
May as well just put this in here.
Changed the name to GeneralUtil
Markers were not replaced in plain text in <h1> elements #39691

This is because plain text converter usually uppercase <h1> elements
thus the case-sensitive markers was not subsituted.

Thanks to Georg Schönweger
Updated references to SVN/Subversion and Sourceforge in documentation, in addition to rewording some things to make them make more sense now that we're using github and its issue tracker.
Hopefully fixed issue with installing denoiser so that it is executable now. Apparently putting it under package_data drops the executable permissions, so we have to put it under data_files.
Merge pull request #418 from jrrideout/issue_334

Updated references to SVN/Subversion and Sourceforge in documentation, i...
Denoiser executable is now built and copied into the scripts directory. This should clear up issues with permissions and work for both dev and user installs, including default install prefixes, custom prefixes, and custom script/lib locations. This will also slightly simplify the install process for users because they no longer need to specify --install-data as there is no more 'data' anymore. The denoiser executable is now searched for based on get_qiime_scripts_dir().
Hopefully fixed issue with installing denoiser so that it is executable now. Apparently putting it under package_data drops the executable permissions, so we have to put it under data_files.
Denoiser executable is now built and copied into the scripts directory. This should clear up issues with permissions and work for both dev and user installs, including default install prefixes, custom prefixes, and custom script/lib locations. This will also slightly simplify the install process for users because they no longer need to specify --install-data as there is no more 'data' anymore. The denoiser executable is now searched for based on get_qiime_scripts_dir().
Fixed an unrelated typo that I just noticed...
Merge branch 'denoiser_install_fix' of github.com:jrrideout/qiime into denoiser_install_fix

Conflicts:
	doc/install/install.rst
Merge pull request #420 from jrrideout/denoiser_install_fix

Another attempt at fixing the denoiser install issue...
Added support for gzipped SFF files

Modified qiime.process_sff to use qiime_open in 'rb' mode (default 'U' mode
does not work), added a gzipped SFF file to test_support_files, and modified
test_process_sff.py to perform all the tests on the gzipped file in addition
to the non-gzipped file.
Fixed bug in MOTHUR taxonomy assignment for unassignable sequences.  This is now treated as a special case, and the confidence is set to 0.
Merge pull request #426 from kylebittinger/mothur_no_assignment_bug

Fixed bug in MOTHUR taxonomy assignment for unassignable sequences.
Moified doc string for qiime_open

Doc string now warns to be sure to open binary files in a binary mode;
default mode of 'U' opens in text mode.
Merge pull request #427 from adamrp/process_sff

Added support for gzipped SFF files
[-] Kernel: Fix missing CXD2820R config
[*] Build: Move changes from smithy for teletes build

Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>
[*] Build: Increment config templaete version for force reset stb830 environment

Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>
JL's changes broke SC.DateFieldView but we don't
use it so disabling it for now
fixed scroll tests
we added more space but never updated the tests
Jakaś tam stabilna wersja
rescan pci devices
Reverted Tele-op General.c to "final draft" form

Debugging will be in a separate .c file. Commit to come later.
a and b?
Merge remote branch 'origin/master'

Conflicts:
	b.rb
Fixed bug with new clang 3.1+ and -faddress-sanitizer
https://github.com/Ettercap/ettercap/issues/10
	modified:   src/ec_conf.c
Fix typo in changelog
	modified:   CHANGELOG
Merge pull request #17 from LocutusOfBorg/ettercap_rc

Ettercap rc
1. Rename init_ssh_connect()/close_ssh_connect() to open()/close()
2. Set time-out while sending/receiving data
Merge from Perforce
Merge branch 'bug/wsgcagent'
Attributes are modified
* fancy highlight
- damn binary files again
Changed i18n info.
bump grok
- bump cabin
- pull in joda 2.1 to fix a leapyear problem
- make sure joda time is the right version
- make sure joda time is the right version

Conflicts:

	Makefile
Added a filter to add fields from environment variables
the metric type config is @metric_type, not @type
Put in a slow time stamp parser for CRuby. This makes the app at work in MRI for me.
Merge branch 'master' of https://github.com/logstash/logstash
Update lib/logstash/event.rb
Graphtastic Metrics App Output Plugin.
Merge remote branch 'origin/v1.1.0.1'
Merge branch 'master' of https://github.com/logstash/logstash
Merge pull request #120 from gja/patch-1

Put in a slow time stamp parser for CRuby.
Add @gja for adding MRI unix_timestamp support!
Merge pull request #119 from gja/add_fields_from_environment_variables

Added a filter to add fields from environment variables
set new filter to experimental for now
adding note about env filter and unix_timestamp on cruby
- default to warn
- make metrics go to a separate channel
- Add heroku input plugin.
  input { heroku { app => "myapp" } }
カラーが死んだので直した
Pass referrer in POST data
decide directory hierarchy
Adding missing permissoins + Cleanup.
OG Features update.
Setting factories as group content.
Adding factory permissions.
Cleanup.
Merge branch '25' into 86
Adding production order tabs.
portal culling todo
Update NuGet references

Also add NuGet auto restore
Mob test
Update
Save state before threading
New class added. Will be used to bind cooldowns to actions.Allows for
easy adding and removing of actions from units.
Removed dependency on LWJGL. Shifted all drawing to the java AWT
framework. 'x' and 'y' fields are now doubles and inherently grid
values. Each box contains its own 'hitbox' in the form of the AWT
Rectangle. A block is only drawn if it's 'updated' field is true.
Removed legacy methods such as 'clear', 'getBlockOrigiAtGridValue' (that
name...), 'hasBelow', 'hasAbove', etc. etc.
Block textures are now stored in a static hashtable.
No longer has a width, only a 'x' and 'y' coordinate. Added skeleton
code for the possibility of a target unit affecting the camera's
functionality.
Privatized fields, added getters and setters.
Revamped game. Not dependent on LWJGL anymore.
Cleaned services to match the whole naming convention.
Fixed fixtures and console commands.
fix bug with relay connections
bugfix
Merge branch 'master' of github.com:IMAmuseum/tap-cms
added hook_tourml_stop_alter
initial import of graphviz module
Fix the order of migrations
When importing/updating items perform indexing only after the transaction was commited.
Another art try
mas race conditions; ponemos semaforo en el evento principal
updated comments and fixed grey issue
working on ribbon
add xxx
Merge branch 'master' of https://github.com/IsaacLi/getRenren

Conflicts:
	xxx
changed favicon icon format
Don't use Names
added delegate when a row is clicked
changed .txt file to markdown
Added green eye animation
Merge branch 'master' of github.com:JetFault/Darkness
Added link to resume and fixed for url
Version 2.1

(almost) all changes are listed at http://ftpbox.org/changelog
add growlnotify rspec effect foto
Filename od backup file can be specified.
Yay WebShare online
Feeling zen-like calm, database re-created.
le makefile gère le serveur parfaitement, il manque le client + quelques fonctions pour gérer le serveur, comme l'envoi des bonnes informations pour le client etc.
Use MTPD of cmhtcleo
Så har i kun én by på hver position

Vildt!
fix logic error in HD.v
Add standalone tex file
update for django utilisation
Added files for codemirror's autoloader and new mode 'shell'
Lists, Icons and Theme Updated
CKeditir bug fixed
CatLab late bug fixes.
load function added
css additions beginning
Forgot to change branch before opening Unity

My Bad :(
RING: Finish implementation of Rotation::updateView()
And disable ourselves
Bug fixes and code cleanups
1) Documentation clean ups
2) Declared some package variables as private that should not be exported
3) Added utility function FetchRows
commit all
fixed conflict
Deck Controller Frontend
added output of dependency graph, readme for assignment 2 submission
Fixing indent errors
Revert "Nathan Green - Changes while helping others"

This reverts commit 8c6f794ed4610dfe67ef2ebe815a925ee5eb455d.
Lua関数呼び出し部分のコード重複を整理
ルール設定画面の移植をマージ

Merge branch 'porting' into 2.0
解放忘れの対処をマージ

Merge branch 'porting' into 2.0
大書する文字のフォント
サイコロの画像追加
リソースのマージ

Merge branches 'hugechar' and 'dice' into charchip

Conflicts:
	graphic/graphic.rc
	graphic/resource.h
ダイス画像の表示用クラス
Merge branch 'charchip' into porting
_maxLimit change to 10 on bookmarks and codes
#72 Eliminar / Desactivar cuenta de usuario [IN PROGRESS]
Merge branch 'master' of https://github.com/MilkZoft/codejobs
fixed ending ' and one more description
ajout du gloubiboulga dans le mcchicken
removed gitignore and robots.txt
[non-upstream] Satisfy Nsight build and packaging requirements
Core/Phase: Implemented guid part.
added the Lib.h and Lib.cpp files.
random user history changes
merged history
documentation update
documentation update
Merge branch 'gh-pages' of github.com:Neverlord/libcppa into gh-pages
documentation update
More PW warnings/comments
added for C
Added sp_count (calculation of tdwgtotals).
This is adding sp_count (tdwgtotals) calculation.
Merge cell_pref and cell_score to generate pref_score.
Calculate mean and max of pref_scores.
Added an optional analysis excluding Gramineae.
Fixed rules (issue #22).
Removed exceptions from NzbDrone.Services.
Added MinOrDefault for IEnumberable<int>
Fixed: An issue with Episode Searches that had full season results
enable logging
add name support for Link elements
map MediaTypeMapping objects to SupportedVersions
pass entire version object in login event
Segunda tanda de arreglos

- Arreglo del reset diario de experiencia de guild
- Implementado el sistema de eventos / actividad de guild
- Mejoras en la ganancia de reputación de guild
- Arreglos varios de hechizos

Autor: Darkpeninsula
Más arreglos varios

- Arreglo de "Oleada de sangre" (Guerrero furia)
- Arreglo de "Voluntad de la necrópolis" (Caballero de la muerte)
- Arreglo de "Tótem Garra de piedra" (Chamán)

Autor: Darkpeninsula
Revert "Revert "Más arreglos internos""

This reverts commit 56f9a52b4a3c990b1d967324890928229241daf1.
Исправлена опечатка приходит -> подходит в заметке про Bushi.do
Add reset.css and screen.css for WP
signing cgi-script is finished, tested, works.
-Fix (#111, #148): hopefully fix our non-ANSI-C abuse on certain Linux machines
removed compilation error with javac (Eclipse compiler passed!)

git-svn-id: http://orient.googlecode.com/svn/trunk@6178 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed synchronization problems between cluster nodes

git-svn-id: http://orient.googlecode.com/svn/trunk@5796 3625ad7b-9c83-922f-a72b-73d79161f2ea
Bug correction AOC
Added a core class file
Did some hot mods on VIM
added syntax proposals
added scaffoldtable proposals
attack of the syntax highlighting
described refernces necessary to make this all work
jazz nazis
-Server folder added
Client generator fixes

Generates correct name of module with Rails 3.0
Payload is sent with request
stacked buttons

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
spelling error
Merge branch 'staging'
gz-23: Set up the superuser home page and added the ability for the superuser to delete users.
gz-23: Added the ability for superuser to edit other users account settings.
gz-23: Fixed a couple of consistency errors.
gz-23: Made deleting a user delete both the User and GZUserProfile object instead of just the profile.
gz-23: Changed the ability of the superuser to delete other users to the ability to deactivate or activate users.
Merge branch 'gz-14' into gz-22
Merge branch 'master' into gz-23

Conflicts:
	enhancement_tracking/forms.py
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into gz-23
gz-23: Changed all templates to use an unobtrusive javascript style.
gz-23: fixed a typo.
gz-23: Adjusted long import statements to use the recommended style of PEP 8.
gz-23: Moved the javascript for the buttons to the bottom of each template page.
gz-23: Stopped using the session to pass around user info for superuser actions and instead used a method that uses URL parameters. Also, added decorators to ensure that only superusers can access superuser views.
gz-23: Moved all javascript to the bottom of the template pages.
gz-23: Added the minified version of bootstrap and enabled gzip compression.
Merge pull request #23 from PolicyStat/gz-23

Allow superusers to edit user account data
GrupoAction
add very dummy test to make sure the example of the README works
added basic password reset functionality
fix merge conflict
initial per-sheet property permissions implementation
Added README in the Markdown format.
added django-twilio to requirements
started models for messages
Fixed issue EM unit tests broken due to  missing LEMradix variable.
Fixed issue #6264: Unable to access data entry screen
Dev Fixed issue #6260: Unable to complete last step of fresh install
Fixed issue #06267: array_filter of ranking question does not work in Chrome and IE
Dev disabled this feature
Fixed issue #06261 : unable to preview non-active survey, group, or question
Description
Dev : put test in replacements, maybe best is to rework Survey_dynamic::model
Fixed issue #6264: Unable to access data entry screen
Fixed issue #6188: Display error in conditions editor when selecting several options per sub-question
Fixed issue #6244: Survey creation is not set properly
Fixed issue: Problems with activation/deactivation when using MSSQL server
Fixed issue #06138 : crash MSSQL in token information
Dev : keep % to have information with token admin edit
Fixed issue #06272: Tokenlist is empty
Dev : Clean up invalid JavaScript
Fixed issue 06257: Manage token attribute fields language url tabs show "Array"
Dev : Fixed incomplete function call
Fixed issue #06256: Touch event support
Dev : Added "jQuery UI Touch Punch" plugin
Merge branch 'Yii' of git://github.com/LimeSurvey/LimeSurvey into Yii
Merge branch 'Yii' into YiiAPI

Conflicts:
	application/models/Tokens_dynamic.php
Dev: need to add a default value to parameters that aren't being passed all the time
major edits to interface
Merge branch 'master' of github.com:RafiKueng/FSMlens
Merge branch 'master' of github.com:RafiKueng/FSMlens into rk/redesign
finished ned fits reader
minor update
adding timthumb
The work continues...
serial ammeter bugs
fixed #63 Razor launcher should access history on arrow up/down
Fix various typos

Volume plugin's setting values' case was inconsistent.
Fix README
Update translations
Adding RazorDocument loading support
listen 80 weggehaald
routes aangepast
New test build, testing new meta tag and smaller country rows
Minor CSS Styling changes
Removed eclim plugin.
удалил точку посреди предложения
изменил политику валидации логинов
Поправил копирайт и скрипт миграции
recurring cycle with regex
Changed to WP3.5
Updated plugins and themes
Created the baseline theme
Change URL to work through any network
Change to wordpress 3.5
German labels added
Merge pull request #3 from fornex/patch-1

German labels added
Cleanup
cleanup
Implement the first internal events
implement tab management, added config and info tab
Renamed body colour var: $bgColour > $bodyColour
Renamed primary/secondary/tertiary colours to numbered hierarchy
Added shop page
Added GnomeFacade page
Added Gnome Manager
Added Gnome
0.95045 - Flight updates
CHanging performance counter names.
Improve error messages for counter creation.
Improved error handling in wait_all et.al.
Modifying pingpong example to show how to pass large vectors in a shared_ptr.
Fixed #565: HPX doesn't shutdown properly
Actually run bgeigie index spec.
Basic audio stuff.
약간의 알고리즘 개선
loading data from resource files - beginning
loading data from resource files - beginning
binlog: added XXX's to critical issues
added gottago_get_lines_for_station() again
Special:Upload intro text changed
Began fiddling with publishing

Also switched to using() syntax for file readers to clean up a bit
better.
Changed to using Directory.EnumerateFiles() instead of GetFiles to build
the query into the request to the FS.
improved hover binding. Right/pet/stance bars now visible in hover bind mode.
Fix content
Use 'm1' as redirect url after payment was processed by VCS.
30.11 12.00
30.11 15.00
Include filename when printing errors
Cleanup the repository. Removed some shit files. Made a git ignore file.

Signed-off-by: SkyFire <admin@projectskyfire.org>
'initial commit'
Merge branch 'master' of github.com:Sniperumm/Wysiwyg
Server
have a config file
SONAR-1927 Rename Default Filters to MyFilters
SONAR-1927 Split Global and project dashboards
SONAR-1927 Cannot unfollow all dashboards
SONAR-3802 integration select2 3.2 + rename jquery.js
Support embedded in memory database
Fix rule escaping
Remove some duplication
SONAR-2706 Fix issue detected by ITs
Halfway through the texture fixes.
Now correctly converting Blender textures into spaciblo JSON.  As a side effect, now we are generating individual vertices for each face instead of reusing them so that UVs can be associated with them separately.
Futzed with the default lights.
Added a load space command
Some widget fixes

Labels properties are now completely in the datamap
Button renders a defunct colored rect
Rectangle for UI rendering
renvoi vers la page de virement avec une erreur si pas de virement
effectué
Amelioration de la page de virement (localisation et gestion des
erreurs)
déplacement libellé et catégorie d'opération vers transactions
update du java pour coller à la base
Added shoulda to test group
Added bin (binstub) to gitignor.
Added user friendships and associated tests.
Stack of render states!

… Well, that wasn't really any cleaner. But at least
all the messy shit is in a single place.
KMeans Algorithm runs and can be mirrored.
Fix issue #1543
Backport CI_Config::load() optimization from pull #1571
Alter CI_DB_pdo_result::num_rows()
Backport fix for issue #1314
Change is_loaded() to return a reference
Fix warning by profiler when userdata has objects

If session data has objects and profiler is enabled, a warning is trown:

> A PHP Error was encountered
> Severity: Warning
> Message: htmlspecialchars() expects parameter 1 to be string, object given
> Filename: libraries/Profiler.php
> Line Number: 514
Merge pull request #1675 from Dentxinho/patch-1

Fix warning by profiler when userdata has objects
Style fix and changelog entry for pull #1675
Backport a fix for oci8_result::num_rows()
Backport fix for issue #1699
Grep now ignores binary files
javascript moved to bottom of page to improve performance
Fix issues #227 and #907
Backport security fixes
Bump version number to 2.1.3
Fix issue #1715
Really fix #1715
Merge remote-tracking branch 'upstream/master'
- Fixed small semantic error
Bug Fix
Ufos with random waypoints may not always return a region,
in which case, the game crashes.
this fix sets the text to "unknown" if no region is found.
Merge pull request #192 from Warboy1982/bugfix

Bug Fix
Added more demo code, fixed silencing of string-inst
Merge branch 'refs/heads/master' of git@github.com:SynthSeq/synthseq.git
Merge branch 'refs/heads/master' of git@github.com:SynthSeq/synthseq.git
Added a very basic betting system!
FIX known_command erreur de parsing
- fix for oracle data source
Finished Artist Account Panel
appendix written !!!!!!
Merge remote-tracking branch 'origin/master'
Add CAF qcom/display variant

Change-Id: Ib028f4d81f610dc9549d4084f14ee5a652f33714
new toolbox class with first helper function + alias
GridSpllter Demo
Added printing options to optimizer
Finally remembered to add Day.h!

Now the optimizer can print a lot of messsages or none
Arrows bug fixed
test on serial runs (locally)
Embers project
Switch branch 'dev' version to 0.2alpha.

Bump the version number on the 'dev' branch to '0.2alpha'.
test
Merge branch 'master' of https://github.com/TylorF/AudioSwarm

Conflicts:
	api.php
Removed some old files from the test directory
Add next page scrolling back in

Allows scrolling to the next/previous page when on the last/first thread of the current page
Fix: sorting mods & parsing times
Tweaking CSS date size so that headline is more important than date
fieldsCommand is added to JDWP module.
Fixed JumpTo method, JumpTo is still disabled in 0.1
Log error if device creation failed
Intel GMA cannot handle 32 bit indexbuffers, please test on a GMA device please
Added link to directx runtimes
Terminate Vocaluxe and show a message box if no DirectX runtime was found
Merge remote-tracking branch 'remotes/Darkice/release-0.1' into release-0.1
restore some styles inside .content blocks
fix for blockquote and ol styles
change README to redirect people to playground
Modified import (module and book (tag remove)) Create book (fatal error), minor update documentation
push webc-id to run when we have a network
fix some bug with build
Signed-off-by: fzerorubigd <fzerorubigd@gmail.com>
Added unit test for #4290
Fixed a related issue with the ThreadExecutor fix

Don't call reportErr when the message type is a REPORT_INFO, but call reportInfo instead.
enable /LTCG for Release builds
move astyle options to astyle.ini and use it in runastyle and runastyle.bat
astyle.ini: use --lineend=windows since when having autocrlf=true using --lineend=linux messes up the line endings
add vs2010 gui projects
add vs2010 project (static x64)
Shut up visual studio
working out whitespace notes
changes for martell to clean up fopen
changes for martell to clean up fopen
remove trailing spaces
remove trailing spaces
Restore mysql sample config
New functions, changed the way player variables work
Reogranise class methods
StuntBonus for all
Se agrega el repo de code mirror, para usarlo activamente en codeUI. También se agrega todo el sistema funcionando. Hace falta ver como meter imágenes, Talvez se necesite usar un sistema de CDN o simplemente montarlo dentro del mismo server o usar hotlinking
disallow crawling in downloads directory
created README for the repository.
Añadiendo esqueleto de la nueva web: Licencias
Bumping to 1.8.1-SNAPSHOT for development towards the next version.
Default settings matter. Make auto-update opt-in.
Prevent plugins from spamming the console.
remove incomplete projects
text
Update documentation to reflect GET for session instead of POST
functions changes
fix
#17 update apk
There is now two display result mode, imprve IHM a little bit
remove useless files
fix clean target in makefile
third part of add item commit
adding grouping parens
Merge branch 'master' of github.com:acmeism/pegex-pgx

Conflicts:
	pegex.pgx
REIXS: REIXSXESImageABEditor: sets sum range min and max when setting shift values in onApplyToOtherScansChosen
Promo page build added
Initial Commit of the fvcom unstructured server
Adding wiki documentation to repository, will add parser and a django view for docs
added test harness, docs, etc.
Shoring up admin population of database for grid and time indices.
changes to populate db remotely, and using only python
untested: starting to refactor, did deployment specific settings in this go
use server_local_settings.py to set locations of datasets and local db
add wmstest to views and localhostip to config settings
added call to kill the parallel workers, so that i dont keep spawning them with every call
commuit
refactoring large scale design
getting code base ready based on current working service
Merge github.com:acrosby/fvcom_wms
add array interface for hash_set.
* Added `RectRegion` querying to the quadtree
move Travis config to the right place
Dodanie modeli i pierwszej tabeli
Adding README.mdown
Changed mocha version to 0.11.1
Consistently use struct dwc_otg_softc instead of dwc_otg_softc_t
Restructured README.md

Split up the instructions into Basic Installation and Additional features. Added Summary section.
Repaired gemfile
Force display update after doing a page scroll
Merge pull request #61 from adobe/nj/page-scroll-fix

Force display update after doing a page scroll
Chart translation
Fixed #189,#190
Ignored bin/ and gen/
osdep: Move qemu_{open,close}() prototypes

They are implemented in osdep.c, so keep the prototypes in osdep.h.

Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
qga/channel-posix.c: Include headers it needs

Include:
 - <errno.h> for errno
 - <unistd.h> & <fcntl.h> for fcntl()
 - "osdep.h" for qemu_open()

Some of those headers were probably being included by accident because
some other headers were including qemu-common.h, but those headers
should eventually stop including qemu-common.h.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
[AF: Included osdep.h instead of qemu-stdio.h]
Signed-off-by: Andreas Färber <afaerber@suse.de>
qapi-types.h: Don't include qemu-common.h

Needed to prevent build breakage when CPUState becomes a child of
DeviceState.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
[ehabkost: include <stdbool.h> too]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
конфигурационные доработки
added django app
djangp app working
Arreglos de estilo:

- el icono de twitter era el mismo que el de facebook (fixed)
- en la página de contenido el banner de compra se comia el contenido si hay poco (fixed)
- en la página de compra, el "disponibles en horario comercial", ahora alinea verticalmente con el "Enviar" del botón al otro lado
- en las "homes", los 3 iconos + 3 titulares de debajo de la zona de la imagen ahora son links.
Arreglo de algunos fallos en IE8 y IE7
added compiled site
Only allow viewing accepted fields for non signed in user.
fix auto-sizing of scroll view in card editor
use the textured background for the scroll view in the card editor
fix update of status bar after returning from a full-screen card view
add information about the device's system version and whether is uses an adaptive status bar
fix rendering of device information
add image for adaptive status bar
add new default image
CardDecks-2.2.2
CardDecks-2.2.2
Ensure that timer readouts are initialized properly
Added some OS X customisations.
added .elc to gitignore
Handle insert() for LinkedList. Handling insert at position 0 or insert at a position greater than the number of elements in list. Need to handle the general condition which is inserting at middle.
Update kivy/uix/kivyconsole.py
improve strict C++ compatibility
remove unrequired libs
set autocommit = 1 when connected
Merge pull request #419 from aledsage/fix/failing-integration-tests

Fix integration tests
Merge pull request #417 from aledsage/refactor/delete-SshBasedAppSetup

delete legacy ssh based app setup
Refactor start/rebind hooks for overriding
"activate sensor registry" to happen automatically

- Instead of doing sensorRegistry.activate after registering all the
  sensors, have the sensor polling begin immediately as soon as it is
  registered.
Dumpers.logUnserializableChains

- log on separate lines
- Caller (RebindTestUtils) logs if Dumper throws exception, rather than
  swallowing it.
fix rjs issue
Stateful activity fix
doc/Platforms.txt: add "armv7l/unknown/linux-gnueabi"
no gitignore/database.yml
gitignore
Optimiere Methodenaufbau, erweitere Dokumentation.
Added user info modal/views
Merge branch 'master' of https://github.com/alexlo03/CodeSwap
Loading modal added, progress made on view modal
Viewport Component, grunt-saucelabs, FastClick
eurusd returns last day of the month
did more work!
did some work on the command line parser
Apply options overlay on project hover
no underline on name link
Atualização da descrição do método de get.
Add a global request callback.
Make the project use CocoaPods to integrate RestKit.
Update for Redmine 2.1.5.
Refactor config data-method=delete
Node config as admin only
Add search query to results
Ditch ec2 discovery
Added wireframe materials example (using lines, triangles and quads). Thanks to @jwagner and @pyalot
Bumped docs version number to r50. Updated Material docs.
pythonまわりいらないの消した
大量调整配置

对脚本文件进行了调整优化
尝试不要忽略bin目录

貌似没有成功
尝试优化料单表单显示速度(刚刚完成材料表单项的构建)
Add ATmega48/88/168 symbol
clearify roadmap
refactor formatting characters into before/after so that they don't appear in non-git contexts
added the feedback
Divide classes into niobjects, compounds, and basics.
Do not duplicate classes in info structure.
fixed mux routing
Removes Eclipse project and outdated project folder
Cleanup
Removes unused help-support from dialog framework
Removes some other unused parts of the framework
Removes more unused features
Simplifies interaction handling in dialogs and wizards
Sidereals can spent all their free points on one College
Forces commons-io:commons-io:2.1
change ProcFile
Added support for <datapoints />
errno package import
Merge branch 'master' of github.com:andrewdyates/qsub
Fixed generate teams
Merge branch 'master' of github.com:andrijan/Fifa-ELO
Creacion de un Login
Creacion de un Login
slight optimisations here and there. formatting.
Fixed typo on posix builds
Merge pull request #341 from apathyboy/feature/plugin_cleanup

Fixed typo on posix builds
rev update
Merge https://github.com/friendica/friendica into pull
turn off new friend activity by default
allow setting default new friend notify
profile change activities
stray log statements
send link directly to profile tab
extended the "interesting" profile attributes
bug #369 - show contacts who are not in any groups
stray debug statements, forgot to filter pending contacts
validate_url allow naked subdomain if is "localhost"
quattro: work on
    "like" activitiy items less visible
    fixes to widths
    popup notification out of navbar
    category input in jot
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (22 commits)
  stray debug statements, forgot to filter pending contacts
  bug #369 - show contacts who are not in any groups
  extended the "interesting" profile attributes
  send link directly to profile tab
  stray log statements
  profile change activities
  allow setting default new friend notify
  turn off new friend activity by default
  rev update
  diabook-themes: fixed css for settings aside-links
  diabook-themes: css-fixes in aside
  fix css in aside
  query to find un-grouped contacts
  reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
  turn off update transactions until we figure out how to do them safely.
  table cleanup
  quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
  main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
  settings: remove call to profile_load()
  quattro: move center css to style.php. add tpl for generic_links_widget
  ...

* master:
admin: change global theme settings
quattro: add admin theme settigs. darker items background with a bottom border.
display settings: show theme screenshot on page load
move html out of lang_selector() and new template lang_selector.tpl
quattro: language icon in navbar
Merge remote-tracking branch 'friendica/master'
Merge pull request #230 from fabrixxm/master

some work, mainly on quattro
0.1.8 - NodeRequirer refactored : @property / @staticProperty exp for bundleRoot, webRoot & requirejs
Work well on both. HD Graphic And GeForce GTX 560
Removed the old webgl code and added a basic template code.
d3dretrace: Add d3d9 prefix to d3d9 specific files.
d3dretrace: Basic d3d10 support.
Don't defer arguments when functions fail.
d3d10/d3d11: Add sideeffects/internal attributes to specs.
d3d10,d3d11: Rudimentary retrace support.

Doesn't work often, in practice because dxgi calls are missing from traces.
retrace: More useful warnings for object mismatches.
d3d11: Trace UpdateSubresource blobs.
d3dretrace: Fix MSVC build.
gui: Make FrameDataProvider destructor virtual.
snappy: Always build with NDEBUG define.
gltrace: Don't use struct for Context.
add button instances/ rename them later
Merge branch 'master' of github.com:ar1skom/unimobile
added requirements.txt ; updated gitignore
add a web script and add a new model inference
Convert to html5
Added the suggested structure that will be used for the data layer.

Most (or all) of these classes can become static classes because
instances doesn't seem so necessary
test1 is good
Minor: GH Pages doesn't support Liquid raw yet.
edit invoice
Merge branch 'ashay'
first commit on antara
pull inwise on antara
pulling latest inwise
merge conflicts resolved
DB Movement
2012-03-22  Artem Simonov  <asimonov@rim.com>

        Since configure is a generated file, we really shouldn't be modifying it.

        Reviewed by Jeremy Nicholl <jnicholl@rim.com>.

        * build_for_playbook.sh:
        * configure:
2012-03-22  Artem Simonov  <asimonov@rim.com>

	Improved ignoring of libelf on QNX.
        Someone else could define HAVE_LIBELF and then we'd just fail.

        Reviewed by Jeremy Nicholl <jnicholl@rim.com>.

        * gresource-tool.c:
Embed rabbitmq-c + rabbitmq-codegen
Adds rabbitmq-c distribution
seutp.py install, now calls build
Update .gitignore
Renamed to 'librabbitmq'
added dfs,id-dfs and tested them
Yea, as Athena sprang forth from the head of Zeus, so sprang forth the core Benthos classes