labofsahil/github-event-dataset-2012 huggingface dataset:
merged changes between nginx-1.2.4 and nginx-1.2.5
updated the information of README.markdown
Merge pull request #116 from zhuzhaoyuan/merge-nginx-1.2.5

merged changes between nginx-1.2.4 and nginx-1.2.5
cool！
Merge pull request #119 from zhuzhaoyuan/update-readme

updated the information of README.markdown
released Tengine-1.4.2
Merge pull request #122 from yaoweibin/tengine-1.4.2-2

released Tengine-1.4.2
remove unused variable in sysguard
bumped version
Merge pull request #124 from lifeibo/sysgurad_var

remove unused variable in sysguard
Merge pull request #125 from zhuzhaoyuan/bump-to-1.4.3

bumped version
fixed a segment fault bug with upstream check module when check timeout is longer than the check interval
change data type "ngx_int_t" to "int" to get rid of the compilation warning "comparision is always true".
removed the unnecessary parentheses
Merge pull request #129 from yaoweibin/fixed_check2

fixed a segmentation fault bug with upstream check module
Sysguard not work on mac os.
updated the description of README and README.markdown
Merge pull request #131 from lifeibo/sysguard2

fixed Sysguard not work on mac os.
2nd version
Merge pull request #130 from cfsego/openssl

change data type "ngx_int_t" to "int" to get rid of the compilation warn...
Merge pull request #132 from zhuzhaoyuan/update-description-readme

updated the description of README and README.markdown
- renamed 'dist' to 'dist-plugin'
- added jar signing
- set required execution env
- fixed export-packages warning
1) Create project select category layout
Fix using view keyword

Fix other missing `view` keyword reference
Added text via Phpstorm
Merge remote-tracking branch 'test/testing-v2'
Master Phpstorm update
- Fixed to make it possible to compile against 9.2beta2.
Added new archive page
Float Adjustement
deprecate.
fix infinite recursion in isWarnEnabled()
Applied comments and remarks.
Use maven-surefire 2.13-SONATYPE for testsuite-shard profile
translations kana
flash: 11.5.502.135
acrobat reader: update to 11
Fix unit test on Windows (had errors due to CRLF when LF was expected)
modified:   client_system_test.cc
	modified:   plnode/protocol/plexus/plexus_protocol.h
Code changes for Dec-20-2012-12-16-47
+aero & refactor
Renamed the library from 'Tags' to 'tags'.''
Updated LINQ  extensions
added views for genre
Taken default colour scheme from recent version of suckless' dmenu
Add support for height option
Update documentation
Added clock and realized that console logs suck
Fix inspecting route redirections

This commit fixes route inspection in `rake routes`

Before:

  foo  /foo(.:format) :controller#:action"

After:

  foo  /foo(.:format)  Redirect (301)
Started work on Dispatch Service.
Moved lots of utility and server components out of CoreService and into
Common.
updated to test site files
sess: main: Remove unneccesary remove_last_uuid()

This is taken care of in write_end_entry().

cc45a45e-520f-11e2-8bbb-0016d364066c
sess: Add some source comments to explain things

c45d1f94-5212-11e2-8f6f-0016d364066c
Add more computer Players
TakeAWin and TakeAWinOrDefend
Refactoring
Probably tweet fix.
Allow use of an empty key string with CefV8Value methods (issue #718).

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef1@808 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
commit so i can delete currently unused code
Remapping players data properly when reconnect MySQL database
Partitioning of result into layers. Minor corrections of GUI.
Removed printing (testing use).
Merge branch '2.0' into 2.1

* 2.0:
  [Locale] fixed tests
  [Config] Fixed tests on Windows
  [TwigBundle] Fixed tests

Conflicts:
	phpunit.xml.dist
	src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
[Locale] updated script to generate separated data directories for different ICU releases
[Locale] updated ICU data
[Locale] updated ICU data paths
[Locale] fixed tests
[Locale] as of ICU 4.8+, slash ("/") and dash ("-") are interchangeable, you can use any of them in a date/time pattern
[Form][Locale] updated minimum ICU version to 4.0
[Locale] changed build data script name
[Locale] don't create a "current" directory anymore, uses only the ICU version as the name of the data directory
[Locale] updated CHANGELOG.md
[Locale] renamed function
[Locale] added note about ICU data building: use the same PHP intl/ICU version as the desired version to build
[Locale] updated README.md
[Locale] added more information to the README.md regarding the need to build the ICU data when the intl extension ICU data version mismatch the one shipped with Symfony
Created pos.R

This function parses vcftools frq output to provide position pf markers.  Also updated NAMESPACE and DESCRIPTION.
Updated .gitignore
Created demo file
Updated vignette vcf2R
worthless semantic changes, added comments
modify timing of frame-rate-counter-measure
added the check of the end space of the line
fixed coding style
Merge pull request #142 from yaoweibin/fixed_style2

fixed the coding style
Ajout d'un test pour l'affichage du succès/échec de l'opération.
Ajout d'un test pour éviter une erreur quand aucun élève n'est récupéré.
Merge branch 'release-1.6.0' into release-1.6.1
Ajout d'affichages de debug.
Correction de vocabulaire
Ajout de tests pour le rang max des catégories.
Merge branch 'release-1.6.0' into release-1.6.1
Merge branch 'release-1.6.1'

Conflicts:
	classes/classes_param.php
	classes/modify_nom_class.php
	lib/header_barre_admin_template.php
Updated LDAP filters tests

Implied enhancement of the ldapfilter module.
Tests for combine_filters and _parse_LDAP are still missing.
improve big theme
Started work on a CSVTableReader and an associated test
created a population class with the ability to sample with replacement
created a method to sample without replacement
Added a test runner to show the difference between sampling a population
with and without replacement
Updated sensitivity analysis class to also work with doubles as
parameter values
Merge remote-tracking branch 'upstream/develop' into develop
New build
Merge remote-tracking branch 'origin/develop' into develop
Fixes the save error
Updates to some of the custom tags and methodologies
Subscription benefit smart list change
Promotion and pricing changes
Merge branch 'bootstrap' of git@github.com:ten24/Slatwall.git into bootstrap
Add prism primitive and update booleans
Make extrude general and make fillet/chamfer default to all edges
<td> should allow colspan and rowspan atributes
now container keep normal size after change parent in graphical model. change (scenePos) on (pos) because now cannot move children from container
STATIC_URL block in report_email template.
Changed default risk level to 1.
Interface map
Merge remote-tracking branch 'origin/master'
first fixes for resolving paths relative to root
change link in index.html to the applet version of src
formatted usage example
Move the command package back to alfredo package
Removed invalid class references
chmod 755 on scripts/alfredo
Load all plugins from alfredo.commands package
Update requirements.txt
Update urbandictionay command line interface
Added MANIFEST.in file, fix setup.py
Added shebang to script/ud
Added commands package to setup.py
Extending reply capabilities
Extending reply capabilities
Fixing help
Adding cafezinho command

Everybody needs coffee and somebody should make it...
whitespace trash
Site updated at 2012-08-29 14:37:18 UTC
stuffs
initial commit
testing commit of deletion and addition
getting started on feedback stuff
added return_to just for surveys. should add elsewhere. need to clean out extra surveyor stuff when this feature is complete.
working on virustotal integration
should commit this to master branch
fixed Gemfile, updates were breaking for me. also, working more on virustotal integration and app+scan_results. getaddr error using delayed_job but not in rails console.
more feedback work
merged in master
failed merge, woops
random changes
more small feedback improvement, user review persists
hiding review button if its your own app. TODO add logic beyond view
basic edit to faq page
horrible work... just trying to get stuff a bit better for the demo but im tired and sick. gg. good night
Test color attribute
Fix duplicated flashes div
Use Capybara git version
Version 1.1.2 does not provide has_text?
Refactor integration tests
Turn jQuery effects off for testing
removed obsolete patches from samba-python-modules ebuild
moved code over from ubuntu one
lib: Don't force setting configuration on WinCE builds.
lib: Fixing WinCE defines for using STLPort.
Created gh-pages branch via GitHub
Merge branch 'gh-pages' of github.com:tocky/dotfiles
Merge branch 'master' of github.com:tocky/dotfiles
Remove server script
Delete game model
Switch to bootstrap
-Removing some unneeded logging from the network utility
-Tweaking the staff detail screen so it displays the staff member name as its title
branch comet_ver
to show what is object slicing: occur when passing on value instead of
address
Merge branch 'master' of https://github.com/tomxue/toy_cpp
README updated
[from now] Fri Dec 14 11:36:16 JST 2012

diff --git a/2nd/top.vhd b/2nd/top.vhd
index 90a93ca..5798ed2 100644
--- a/2nd/top.vhd
+++ b/2nd/top.vhd
@@ -249,7 +249,7 @@ begin  -- test
     tx        => RS_TX);

 	-- workaround for not-stable VGA signal
-	tx_send_enable <= '1';
+	tx_send_enable <= core_tx_send_enable;
 	tx_send_data   <= core_tx_send_data when core_tx_send_enable = '1' else debug;

 	Inst_dcm: my_dcm PORT MAP(
fix the brokeness introduced in 5ee60746

as modified it only compared the first byte, change it to expand into
an array ref and use is_deeply() is compare.
Added support for Many links in Models
added runTimer.java to git
added run_timer.xml to git
added oridomi.js
Fixed conflicts
Made the Expected assumptions dynamic
Added batch 021
Added mash temps to some batches
Updated with FG
Made mash temperature measurements dynamic
Fixed blob shas in some batches
more fix on the attack thing
CS572,573: Allow levelport beyond Dungeons of Doom

Normally, a (non-wizard mode) player who chooses to level teleport from
the main dungeon to a level below the Valley of the Dead will experience
a random level teleport.  This change instead just puts them in the
Valley of the Dead.

If not level teleporting from in the main Dungeons of Doom branch, the
usual "Oops..." is replaced with "You feel like bouncing off a solid
wall!"
CS574: Fix: Stop Magicbane cancelling inventory

This stops items carried by monsters struck with Magicbane from being
cancelled.
Added diagnostic output for device creation.
Minor changes to ExpensiveEndpoints.scala
Cleanup, get rid of `Globals` singleton
Adding contributor images.
Adding buttons to footer
Escape null bytes in header values.
No need for go nor nodejs at this moment.
Nginx support for max expires of static content.
MH-9247 -- Added missing table 'job_service_registration' to the ddl scripts

git-svn-id: http://opencast.jira.com/svn/MH/trunk@13126 e6edf6fb-f266-4316-afb4-e53d95876a76
MH-9339 -- Fixed media package editor tags handling

git-svn-id: http://opencast.jira.com/svn/MH/trunk@13481 e6edf6fb-f266-4316-afb4-e53d95876a76
reverted to manually specifying the version number
Fix a copy-and-paste error.

git-svn-id: svn+ssh://svn.curseforge.net/wow/ovale/mainline/trunk@639 d5049fe3-3747-40f7-a4b5-f36d6801af5f
Improving usability of Pattern, Path and String.

Signed-off-by: Frank Mertens <frank@cyblogic.de>
Fixed incorrect link on social media icons
assessments contacts
Merge branch 'master' of github.com:unepwcmc/ipbes
devise views, users permissions, migrations
merge conflicts
1.1.28 	ADD: Hide upgrade messages (Settings)
FIX: Page loader once more
FIX: Constant loading when entering gift page
CHG: Show FB Messages/Notifications when hiding bluebar
new file:   test.c
	modified:   README.md
	modified:   README.md
- Updated for NetBeans 7.2.
- Selected the default JVM.
Added Validations , Populate combo boxes ,password management
test as default ns
Fixed issue with invalid binary protocol touch command expiration time
(http://code.google.com/p/memcached/issues/detail?id=275)
Diff current files, commit and bugs
updated version number for the next release
Multiple locations nicely set up to feed array on the server side... tackle client side tomorrow.
Fix function string evaluation

Descended from 360d7adc5 and 2bf9e5c17
Update standard library of macros and functions on account of BGEE
Created _sbrk() implementation to allow dynamic memory allocation on the heap using malloc(3).
[maven-release-plugin] prepare release modbcum-0.0.3-SNAPSHOT
[maven-release-plugin] rollback the release of modbcum-0.0.3-SNAPSHOT
fix production deploy and referral report [ci skip]
[#710] fix view intervention
Merge branch 'master' into wip
newsmooth small update
Merge branch 'master' of https://github.com/verges/mrrocpp
made it so you can delte things on a mac
Merge branch 'master' of github.com:vfseanm/Vooga2
增加了对CDN的支持
Cambios en modulo auditoria, seguridad y el interprete para que se integren bien
Development mode support
Conflicts:
	spec/units/client_spec.rb
Update cassettes
Bug 796649: Build system support for having pre-installed 3rd party apps.
Updated with Index.html
Finished CakeLess.php and modified routes.php
forgot a class name
Print raw html
lo: mozilla is now disabled by default \o/
Set noexpandtab on Windows machines
Updated docs and bin

  * docs/openbox.org: added bluetooth autostrat;
  * bin/obex-fm: small script (borrowed frm wiki.archlinux.org) to open
    in File Manager bluetooth device.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
initial commit
second commit
third commit
dao object moved
dao object moved
search done
aad and edit book
readersDetail
tests done
done restrictions
isbn validation
Merge branch 'master' of https://github.com/vramik/library.git
Added break after top 25 in html printout of rankings.
Updates after week 9.
Minimize exported structs/funcs, add godoc comments
Change C-c C-% to toggle compile on save (and message the user the setting).
Open google-chrome on the first workspace.
fix regex.match bug
plosone.txt
Hooks spec restructuring, fixing a TODO [#158]
New helpers in hook specs
Nicer helpers in hooks test
Clear out old submissions before each hook test
Better "description" for hook specs
Many more specs for git hooks [#158]
Remove more emtpy test unit tests
Merge branch 'master' into feature/grack
Add grack test with multiple users [#141]
Add TODO for water_grack_auth
Test for multiple users in different groups [#141]
Code reuse in grack specs
More tests for water grack [#141]
Update grack
Fix mistake in spec
removed printouts
Merge pull request #340 from bjacobel/qtool

Printouts in QTool
fixes kickOff robot
Camera params for Mexico. By Lizzie.
Merge remote-tracking branch 'northern-bites/master'
- Added logging to control lifecycle
- Fixed bug where errors didn't decrease running calls
Merge branch 'master' of github.com:webdetails/cdf
Merge
Merge branch 'master' of github.com:webdetails/cdv
Sync CCC with that of CDF
Merge branch '4.6' of https://github.com/webdetails/cgg into 4.6
Little fixes in contact module
Little fixes to upload images
Fixes in image selection
Fixes in images uploading
Added contact pages to blocks and added text about required fields in generate forms view
TODO modified
恢复修改surefire的JVM参数，通过修改属性file.encoding跑过testcase不是解决问题的办法
added bracketize to minimongo\sort.js
new name : newsinapp.io
return False when unable to send

git-svn-id: http://svn.tribler.org/abc/branches/mainbranch/Tribler/Core/dispersy@25386 001aeff7-3401-0410-a489-f7902fc005dd
str->unicode so we can send/receive non-ascii chars without crashes
import module from tribler that dispersy depends on
Merge branch 'master' of github:whirm/dispersy
Big slug particle death
README typo fix

eliminated redundant "the"
Merge pull request #36 from brainwane/patch-1

README typo fix
created a version of Volume-URL that doesn't use a web worker, and updated MultiModalViewer to work with just urls
add the module of admin auth
removed Str arg from Array ref so I can store hash refs also
Added ability to specify reference descriptions
First commit
Bob?
Fixed bug, with lists supressing selected events

Fixed a bug in the deferral method that would short circuit the selected event
that would update the Container state.
kody pro AC/DC Y a CbCr slozky. hexa DHT, ktere se vlozi do vysledneho jpegu.
Merge branch 'master' of https://github.com/wozniakjan/GMU
kolejne rzeczy
add a new method tcl_init() to call Tcl_Init().
stricter check of int vals within the authenticator loop
Jquery-UI on LESS
Merge branch 'master' of https://github.com/xel51/4erasmus
fix mainpage
Merge branch 'master' of https://github.com/xel51/4erasmus
regbutton
update to the zui.xsd for zk 6.5.1
update to  zk 6.5.1
release v0.5.5
Low battery voltage indicator. Scheduled motor stopped feature implemented.
add mongo command to Main
more kind projector
imporved pointer use percentage of window
keys command supports finding keys by mask
remove .vim/pyflakes
syntastic conf && submodule
cleanup & fix pyclean
better list of accessors
Typos after reading
Add PDF
Typos after reading
Fix typos on PDF
Print linstall commands before running them, like for lupdate and others.
Teach "qbuild install" to find its stuff in TRANSLATION_SUBDIR.
Add TRANSLATION_SUBDIR support to nct_lupdate through new -subdir option.
Apply TRANSLATION_SUBDIR nct support to libraries/qtopia (nct).
YD: ConsoleTableDataRenderer add a space after cell values
YD: added support for unnamedParameters to ArgumentParser
YD: added support for unnamedParameters to ArgumentParser
YD: added support for unnamedParameters to ArgumentParser
YD: added few commands to the cloudfoundry cli
pwd issue
pwd issue
Bugfixed photos ordering form so DESC ordering doesn't breaks selected option
CustomFieldQuerySet order_by working using some raw SQL by now
Deleted unneeded import
Merge at app.js
Changed tiapp setting to suit barcode scanner
Changing the app.js to button size to dp so that size changes according to screen resolution
Added barcode scanner in transact.js
Metronome update.
88888888888888888
working on richer loc attribute
Update .hgrc email
engine skeleton
Scheduler writeup.
[script,ipc] fix fcitx-configtool when using editor/xdg, ipc handle some dbus error.
[imselector] also use enum to check.......
[cmake] cmake helper cleanup
[cmake] multiple ways to download
[cmake] use stdin file when available
[cmake] fix redownload when download command changes, remove wget dependency
[cmake] doc and notes for fcitx_download
[table] use pinyin lookup from pinyin-enhance when available
[table] do not load pinyin base dict when using pinyin-enhance to lookup pinyin
[cmake, sh] better portability for make pot
[doc] typo in function declaration/doc
完成后台管理商家审核功能

1.后台完成商家审核功能
2.留言管理添加设置成功提示
磁盘使用情况
Cleaned up lib/Euler.hs and #28 a bit, and a slight chance to the concurrency of #26.
redefining the vltage maxes to new flags for test
0.1.6
Update Cakefile/tests.
Alteracoes para colocar animações no jogo para quando forem consumidos
alimentos saudaveis e não saudaveis.
p67-7.c
p67-7.c
seperate merging into its own function
get rid of ar_difference in benchmark
fix sitecore configuration issues
fixes for rails 3.1 with asset pipeline enabled
Point to the right wiki url
BASS: Make Screen::showScreen show warning.

Makes bug #3480936 easier to track.
Slight changes in weechat. Backup prior to ML
removing omnicppcomplete
Add timeout when executing httperf command.

If httperf timeout, we sleep a few minutes and
re execute httperf until we are done.
dodanie funkcji szukania i edytowania.
die stallman
front#template
fix checkout drump
qualche modifica mensa
Merge branch 'master' of github.com:0flash0/Mappone
qualche modifica mensa
fix compilaz mensa
tests are now run from another top level subproject
event handler: added ajaxID reference in events stack
WINKSTART-1087: Got rid of default_api_url on the account level.
WINKSTART-1088 : #comment temporary fix to display payments.
Fixed html validation errors on signin and forgot password screens.
Added basic UI framework.
bronce sin entradas
entradas bronce
 apoya
sponsors
sponsors
Merge branch 'amazon' of github.com:AV4TAr/meetupuy into amazon
Bring in my personal settings

Also includes a loader for my most used packages
Dodanie do .gitignore pliku app_dev.php
Add analytic to php
add copy-right
[Change] Seperate widgets are now used for the game window and OpenGL.
Messing with Messaging.
FDT 22-11-2010 commit.
[enhance] gitignore: update.
[enhance] Makefile: update.
[enhance] Makefile: compile opp with opx.
[enhance] makefile: do not mention .opp.
Merge branch 'master' of https://github.com/Aqua-Ye/OpaChat into plugin-in-opac
[enhance] Makefile: compile with one command.
Merge pull request #4 from arthuraa/plugin-in-opac

Plugin in opac
removed system output from specs
Framework:
  * #run_mods => #audit_page -- and made public
  * #ls{mod,plug,rep} => #list_<type> -- old methods aliased
  * cleaned up specs
DB/CREATURE Crazed Guard

Fix template & SmartAI

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
change git default push policy
gradient tiles
Added image upload (not ready yet!) and tabs display for mobile visitors.
Only include eligible promotions in promo_total
Merge git://github.com/spree/spree
and I would walk 500 more
Retrofits of Andreas Ritcher Mods + replacement of the mailer module by nodemailer
Retrofit of Andreas Ritcher mods + replacement of the mailer module by nodemailer.
some things done + successful Google sign in
Add chainprovider
Add parenthesis
Rename provider argument to providers
Merge pull request #85 from Baachi/chainprovider

Add chainprovider
Fix test
Update README
13.08 17.10
Shakespeare solution to problem 2
Merge branch 'master' of github.com:Barrucadu/euler
Added scaling of the picture to the frame dimension.
Added the new WINDOW_PERCENTAGE zoom type.
Added support for SPECIFIC_SIZE zoom type.
Beginning of the implementation of the PICTURE_PERCENTAGE zoom type.
Added the changePictureZoomType method.
Para UFP pedido, y con cambios de editorfor hacia passwordfor
Recurso.Spanish: Se corrige falta.
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.

Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.

The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
Merge pull request #602 from zan5hin/powrc

Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
Merge branch 'master' of git://github.com/imathis/octopress
Merging in the latest upstream version
don't create cache folder if it already exists
Cleaned up an refactored slightly
Recursive galleries
added subfolder list to galleries (not pretty)
added crumbs to gallery templates
added crumbs to gallery templates
remove debug print
Use doit 0.17 now
Update nikola/plugins/task_render_galleries.py

Fixed refactoring copy/paste error that broke gallery generation
Remove code duplication, makes things neater
make more stuff depend on GLOBAL_CONTEXT, also fix typo that broke deps for several plugins
Lots of small changes aiming at fixing config dependencies
Theme: Foundation.
foundation: use label instead of button
Foundation: Oops.
Foundation: use abs_link in base template.
Foundation: abs linked text
Foundation3 with topbar.
Upgrade to Foundation 3.1.1.
Fixed active state in top-bar.
some changes to the above
gtk-engines-unico 1.0.2 update gtk+ dependency version
Mask gtk-engines-unico 1.0.2
omg-suite-theme: move sed into src_prepare
omg-suite-theme: do the loop for src_prepare as well
Add gsm 1.0.13 to media-libs
Update README.textile with media-libs/gsm
Youpi c'est beau
add ignores
Merge branch 'master' of https://github.com/CIRB/puppet-nfs
Add installation instructions

Also add way to delete bundles
Add Nocilla
Merge pull request #710 from luisobo/add-nocilla

Add Nocilla
[Update] MTDates (0.0.4)
Added gemspec for GoogleAnalytics-iOS-SDK 2.0beta3
Merge pull request #667 from cristianbica/master

podspec for Google Analytics v2.0beta3
[Update] GRMustache 6.0.0, 6.0.1
Add new NSHash 1.0.0
Adding specs for Reachability 3.1.0
Merge pull request #678 from fredjean/master

Adding Reachability 3.1.0
Using newest version of code mirror that handles tabs correctly
Krótka, przyjazna instrukcja obsługi
Updated Top include to read 'edu/cw40' instead of 'educw40' in the css.jsp include

Removed invalid html tag from ccPIF
Merge branch 'conncoll' of https://github.com/ConnCollege/cas into conncoll
Helper functions for importing data

`cot_import_list` - imports data by list of variable names
`cot_import_tabledata` - imports table editing data as array indexed by
records ID
Fix #1086 and more

Reworked template and admin part to fix #1086
Extended error message handling
Using new import helper functions
Fixed data reset on error in adding form
Fixed url used after add/update actions
Add HitBlockComponent to provide a fast block selection.
Signed-off-by: Karang <arthur.hennequin@free.fr>
Add merge method in Renderer

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge pull request #396 from L5D/master

Add merge method in Renderer
Merge pull request #395 from Karang/master

Add HitBlockComponent to provide a fast block selection.
Fixed expression in HitBlockComponent
- brackets needed for order of evaluation
Merge pull request #397 from DDoSQc/master

Rotation fixes and documentation for the AnnotatedObjectConfiguration
Added divide by zero check to HitBoxComponent

Division by zero gives Float.MAX_VALUE.  The corresponding tMaxX/Y/Z parameter will never be the smallest.
Missing bracket
Add Material to render

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Added touchBlock to AtomicBlockStore
- This method marks a block as dirty without changing it
Merge pull request #399 from L5D/master

Add Material to the render method of RenderMaterial
Redone BlockIterator and new HitBlockComponent
Signed-off-by: Karang <arthur.hennequin@free.fr>
Merge pull request #398 from Karang/master

Added a getAlignedBlocks() method.
Include Terrabullet
Early Physics
Disallow onDetached for BlockComponents
@Zidane doesn't understand linear and angular velocity
remove remnants of partially commit

Next time use git revert @Zml2008
Remove byCode
Fix chatstyle serialization
Sửa các lối số 1, 2, 3 ngày 02.11.2012 (trong google docment) .
surls file with checksum string
Merge pull request #989 from KrzysztofCiba/fix-ftsrequest

FIX: surls file with checksum string
BUGFIX: len(currentTimes) is an int, not list
Merge pull request #1070 from sposs/patch-33

BUGFIX: len(currentTimes) is an int, not list
Add color visualization and fix progress bar issues
Setting up Wicket based site project
yet another markdown modification! I hope this stops soon!
Make ZedGraphControl.SaveFileDialog lazy

This is required for headless mono compatability. Without this the SFD
static constructor would try to access X and fail fatally.
NF: Add a times_killed counter to game_state.
UT: Adding test for game_state["times_killed"].
Merge pull request #147 from Debilski/feature/times_killed

* feature/times_killed:
  UT: Adding test for game_state["times_killed"].
  NF: Add a times_killed counter to game_state.
NF: Adding a status line to Tk with timeout and kill counts.
Merge pull request #148 from Debilski/feature/Tk-timeout-status

* feature/Tk-timeout-status:
  NF: Adding a status line to Tk with timeout and kill counts.
NF: Add an option which just runs a game in the main thread.
DOC: Reword the documentation for the standalone clients.
BF: It is no error to exit from standalone mode.
Featured image layer settings dialog
lotko json update at Jun 21, 2012 1:15:27 AM
lotko json update at Nov 19, 2012 7:27:31 AM
list of files updated for 20121219 at Dec 20, 2012 8:29:35 AM
Added an abstract DBM layer
Ordered by alfabet
Oprava layoud login
Update OBD Connection/obd_test.py

tab = 4 spaces
More of a description about issues
Master stylesheet
Slowly making files
added edwardisbad
Merge branch 'master' of github.com:EdwardKL/N6-161
Finalizado Comando de Criação e Adicionado funçao parse da regiao
létrehozások hozzáadva
szerverre
first commit
Merge branch 'master' of https://Enkime666@github.com/Enkime666/pcode.git
vim
fff
test de ecrireListe amélioré
Fix: remove old constants
Fix: trad
Works on alternative addresses management
Fix: javascript DOM problem
New: add getNomUrl() method
doxygen
Fix: status not updated after reopen
Fix: missing linked objects
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: missing public note and private note
Update htdocs/fichinter/fiche.php
Fix: missing tva rates of supplier
Doxygen
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: If a project must be linked to any companies (suppliers or not),
project must be not be set as limited to customer but must be not linked
to any particular thirdparty
Fix: Removed not standard/compatible SQL. External module should not
have foreign keys with standard tables. This creates
dependencies and instabilities of core code. Integrity must be checked
by applications for external modules, not by database.
Merge remote-tracking branch 'origin/develop' into develop
Fixed a bug and refactored draft clearing. Integrated SystemConfiguration framework for Reachability class.
Turned off scrolling bouncing
Merge branch 'master' of https://github.com/Foundry376/46px

Conflicts:
	iOS/46px/ViewController.m
Adds missing public statement on hash method
libwinpr-file: added CreateFile/DeleteFile
Added :W for saving as root
Merge branch 'master' of github.com:FreekKalter/vim
Worked on ExCancellation
Wrote models for Modifications
Nettoyage de printemps : suppression du code inutile
Updated index to say junior, and updated resume
use local ci server
Improve Bulgarian translation.

Almost all of the user interface is translated now. And the BG file is
now structured like the orginal Enlish file.
The error translating is now done

Still have a lot of translating work  :(
The whole user interface is now done.

The pull request is done. For now i don't have enought time to translate
the admin parth. But user interface is more important so i am done with
this.
Merge pull request #37 from Ivaylo-Bachvarov/master

Bulgarian support, thx to Ivaylo-Bachvarov
More work on the ammo class, added sprites and tested constructor
Correct add at so that if the collection is empty, at will be ignored. Remove the model only if it exists on the collection. Remove signal arg from replace method. Correct replace so that it only replaces if the oldModel exists while the newModel does not.
Update builds.
Collections documentation.
Fixed a bug where a layer could not be deleted from a project when the layer was no longer available on the portal.
Removed old menu and shop. Failure now sends you to menu.
Switched from .pages to .pagination to make django-pagination pass their tests
Updates to timeline for tab name change and layout bug
v2.6

социальные кнопки
Added link list helper. This closes #27
bugfix: use correct step mode
improve platform independance (makefile stell needs conditionals)
impove speed and ac/decceleration
[DEV] update to the new tree of ewol
Small fixes for the new Pleaides environment
Implemented Matrix and added ElpasedMilliseconds to Kernel.Time
Moved Kernel initialization and main loop from Application to Kernel
Refactored some Quaternion method names and added BoundingFrustum structure in Graphics namespace
Added ShaderParameterType enumeration
Nothing connected, just cleanup
fix a bug for AutoPrimaryGenerator about new DB
fix bug for Restriction:add()
向 Model::load() 传入 Restriction 对像，会触发 deprecated 错误
Changing the README to markdown format.
killing the second call to jQuery
Improve 138b198111f7e28a260fa2fe3c329e3a853c5708

Signed-off-by: Jille Timmermans <jille@quis.cx>
find and remove same events
Dependencias do interpretador de instrucoes
Correction de la recherche de mot (refs #5)
Ajout et recherche de documents
Updated some tests and removed some unneeded files
Pkg: group create & config setup vs. initial content setup
fix #926 serialization bug
typo
Merge pull request #657 from arlolra/typo

typo
Add rowvec(A, i) and colvec(A, i)

Add two functions for returning row an column vectors of matrices.
rowvec(A,i) returns the ith row of A as a Vector and similarly
colvec(A,i) returns the ith column. This is to work around the
fact that matrix slices are not Vectors.
Document vec(A), rowvec(A,i) and colvec(A,i)

Add descriptions of the functions vec(A), rowvec(A,i) and
colvec(A,i) to the standard function list.
Merge pull request #940 from dronir/master

Functions to get row and column vectors of matrices
Added macros for distributions with three parameters and no defaults
Extend methods for d-p-q-r functions and add tests from the R test d-p-q-r-tests.R
Indentation changes
Merge branch 'master' of github.com:dmbates/julia
Port PR #332 from Propel
860709 - pulp-migrate was not executed during upgrade
Merge pull request #771 from lzap/pulp-migrate-860709

860709 - pulp-migrate was not executed during upgrade
Add Makefile to make things easy
Merge pull request #1 from sangyye/master

Add Makefile
deletion des fichiers de logs pour les tests
modification gitingore du logger
ajout de la var de debug et modif affichage test
ajout du fichier de config de la doc
modification des messages d'erreur
mise à jour de la TODOLIST
mise à jour exemple utilisation webserver
ajout du mode debug pour tracer au mieux les appels
New post about starting machines
Started retrofitting verify with error reporting
Implemented paginated memory for user tasks
Fixes #141 Added movie flags
Added doxygen for StreamDetails
Fixed bug and to long timeout in DownloadManager
Fixes #137 Made filenames completely customizable
Fixed translation
Fixed some windows GUI issues
Fixes #125 Autodownload extra fanarts from Fanart.tv
Remove the icicle-imenu top level key binding
Do not include the diary anymore, it is included in my diary.org
Make use of the cua-selection-mode
Modify upload. Add mimetype
Add an xml FDW.
Add a reStructuredText metadata access point.
All the Dots
Ran my program on narc3.
Manually committed from: https://github.com/UndefeatedChampion/B2W2ger/blob/cd6e07d8d64ca8d05fbfa41b339b145f0858d41f/2/0000/0100.txt
Update master
Merge pull request #231 from mafiox/patch-116

Full Translated 2/0414
Disable iid for uci conf
Feed find uses GET params to load kw as suggested in #14
Merge branch 'master' of github.com:Landric/PANFeed
[plat/x86] fix issue of header file mis-include

See issue #1.
remove useless "use" plugin
add ruby reference manual
Added index-final
Added walkcast app
Added walkcast app
Added walkcast app
Added week3 material
Added tests
Added tests
Removed
Removed pesky DS_Store, should add to gitignore
Removed spy
Polished up ReaDME
Added compass
Added compass
Added compass
fixed week2 conflicts
working on add audio to detail phrase from creating a new phrase
varをpublic/protected/privateに変更
just compile plblockimp when need it
Fix some exploits.
Issue #48 - Build/Deploy
Merge branch 'master' of git@github.com:MarvinToll/SOAj.git

Conflicts:
	soaj-refapp/pom.xml
Marjor changes: damage handling, events, and another sweep of mechanics
and wrappers.
Add nice list display.

Previously the check display was outputing lists with no line
separators.  Add a new function to beautify the parse tree output.
Merge branch 'master' of https://github.com/McLeopold/PL101
Move scheem syntax closer to elephant.

See elephant/ideas.txt for notes.

- modern expressions f(x) -> (f x)

- removed infix {} syntax, will later parse operators

- added blocks with {}, including fn and if blocks
Began Settings
Began Locksreen settings file
Fixed problem with ContextKit (description and station text)
Added transient fueling (Tau) tables to 32BITBASE.xml and created template. Based on work from NSFW & td-d @ RomRaider.
Implemented transient fueling tables in AZ1G101N.xml, posted by td-d at RomRaider forum.
reportes 8.0
Exact and Inexact classes added.
I don't know what's happening in this commit
Revert "I don't know what's happening in this commit"

This reverts commit da07bfa8b5bcb21489cd6cdf7d10179261bb2497.
commit
premature Makefile tuning
Make cleanly without -DCPU_SHUTDOWN.
Revert "Switch to the more complete Snes9x 1.53 documentation." It doesn't match the version used in NDSSFC, and I failed to port to 1.53 anyway.

This reverts commit 2b23b5cbaf15bccc2aae0ff3ee91cedd26f101bd.
model runs: split off (and re-enable) TestMirroringModels
small fix to User Manual (fixes #224) thank you Ken!
fix intermittent GIS extension build failure
Merge remote-tracking branch 'origin/5.0.x'

Conflicts:
	extensions/gis
added an async gevented transport
concurrency is limited to 100 open connections
if 100 connections is exceeded then it will block
this behavior is very similar to the HTTPTransport
Fixed TextureAtlasGenerator, Makes the Options screen look somewhat purty
fix: setup symlinks dbus files
task 4.1 other solution. Main file
According to the input numbers n, k, A1, ..., Ak 	determine the minimum value of binary tree search for a set of keys A1, A2, ..., Ak, and the search range from 1 to n.
task 4.1 other solution. Main file
According to the input numbers n, k, A1, ..., Ak 	determine the minimum value of binary tree search for a set of keys A1, A2, ..., Ak, and the search range from 1 to n.
Added removal of dist dir in clean:
Oddly the Makefile does not have an install method, only clean and build, will have to work placement of proper locations into the install -flag calls subsequent n the spec file.
Removal of make build from %install.
%{_builddir} != $RPM_BUILD_ROOT
Issues with $RPM_BUILD_ROOT, so removed it, assumes releative paths at this time, build completes successfully though no functional testing carried out at this time.
Known issues with scratch bash script from src, quick read notes assumption on /usr/lib/ does not allow for /usr/lib64/.
This should fix Issue #216.
[PowerTimers] fix AutoDeepstandby if already in standby.
[About] try to fix BSOD in Network Information.
Show info when toggling
Add build script

Change-Id: I498617f776bb24b7625fae99fb993477b3e00066
changed some variable names to make the script make more sense
this is nicer #221
Removed .DS_STORE

It will ignore these files from now on.
Merge branch 'master' of github.com:Paxton/VapusAAC
dummy commit
Merge branch 'master' of dhc131.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Merge branch 'master' of dhc131.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Merge branch 'master' of dhc131.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Merge branch 'master' of dhc131.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Merge branch 'master' of dhc131.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Merge branch 'master' of dhc131.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
added options to have debug lines
unknow changes...
removed old experiment class
removed old files
Merge dhc129.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Error when parameter is not found
Merge dhc129.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
New pom file for the new module
Merge dhc129.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
changed capitalization to harmonize
Merge dhc129.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
added option for the filesystem module
Merge dhc129.lsd.di.uminho.pt:/Users/pedrogomes/Desktop/Work/eurotux/YCSB
Forgot to separate file extension in generate script
schonheitskorekturen

Signed-off-by: Phanta <enrico.grunitz@mailbox.tu-dresden.de>
more intelligent seed cleaning
small bugfix
improved specs, with translation testing
transactions & fees
update schema
prepare testenv.sh
refactored transactions api
update db
Write documntation for bulk importer
switch to PyConFr/symposion
add dev and testing setup.py aliases, fix changelog after reviewing commits
Changed the default git editor to emacs
fixed an error when readin_new documents first_line is old.

Signed-off-by: amsl <iamyhw@gmail.com>
lowered hashie deps
fix to be able to pass the permission scope
fix the permission param passing
added minimal group support
Add test that right params are passed to OAuth gem
add post id to add_post_to_group response
Resolve merge conflicts from merging scope changes and groups changes - version conflicts may be incorrect.
Merge branch 'master' of https://github.com/icebreaker/linkedin

Conflicts:
	lib/linked_in/api/update_methods.rb
	linkedin.gemspec
initial commit
a little more informative readme
Merge branch 'master' of github.com:Razzeeyy/br-dev

Conflicts:
	README
little more informative readme
change small to 100x100
Set up sample project, added color scheming for ease of changing it. Even on the fly! Next up, advancing inventory menu work.
Added support for more GCM responses Fixes #55
Create roster_id active admin page with scopes for reporting.
Added roster report and separated aa stylesheet changes into separate sheet.
Update doc/Doku/Gliederung.tex
add Anthony Hristov to AUTHORS
Update pe_carve.py
reformated requirement document
sample & doc, translate
Merge https://github.com/SNDA-FE/Gesture into gh-pages

Conflicts:
	samples/transform.html
Merge branch 'gh-pages' of https://github.com/SNDA-FE/Gesture into gh-pages
prepare for long spaces - step 1: point2d(like) -> intpoint2d(like)
step 2: square(like) -> intsquare(like)
step 3 - point3d(like) => intpoint3d(like)
step 4 : cube(like) => intcube(like)
cleanup
last step : distancemeasure(2d|3d) -> intdistancemeasure(2d|3d)
Merge pull request #9 from Sedward/master

commented out tests
fixed casing on module import
Merge pull request #10 from Sedward/master

more tests
Merge pull request #11 from Sedward/master

encode request
new travis node version
Merge pull request #12 from Sedward/master

producer and default magic fix. check it yo
Merge pull request #13 from Sedward/master

BufferMaker new
merged latest from Seth "Special" Edwards.
fixing filename casing issue for linux
Merge pull request #15 from Sedward/master

initial consumer functionality
fixing casing on module name for linux.
made getOffsets asynch
fixed test server to buffer data properly
hopefully fixing travis build
extracted a "protocol" object
case sensitivity bug on linux
another linux case-sensitity bug.
more case sensitity bugs on linux
more protocol refactoring
updated test.js to reflect changes
Correct doc block for GelfMessageFormatter - it doesn't serialize to Wildfire (that's FirePHP); it serializes to GELF.
Merge pull request #80 from msabramo/fix-GelfMessageFormatter-doc-block

Fix GelfMessageFormatter doc block
pom.xml has an incorrect parent reference with a cleaned .m2 directory
Added withRequiredArg() to host parameter
FTL bundle 2 fix
Merge branch 'release/0.13.6' of github.com:SeqWare/seqware into release/0.13.6
Merge branch 'release/0.13.6'
Merge tag '0.13.6' into develop

0.13.6 Release to master
Working on small bug fixes in the Oozie workflow engine.
Merge branch 'master' of git://github.com/peepeep/Monopoly into peepeep-master

Conflicts:
	Monopoly server/Monopoly server.csproj
	Monopoly.suo
Доработки визуальной стройки
Изменил размер склада по умолчанию для визуальной стройки, для автоматической стройки сделал макс кол-во строений 2
- Fixed vimfiler explorer behavior.
Prevent crashing if client disconnects.
Added winrt dll to SignalR.Client package.
Why did I make INT disable the interrupt queue
Merge branch 'master' of github.com:SirCmpwn/Tomato
added student fixture, in spremenu localhost na androidu
Merge remote-tracking branch 'origin/staging' into staging
empty examdateform
oops
Merge branch 'staging' of github.com:Smotko/estudent into staging
hacky nepodvajanje izpitnega roka
use prebuilt Superuser.apk

Change-Id: I6dbcd2aecb00579acdd8d4bbf3b8a84d4f8a8af2
Touch of work on MessageWindow.

Compiles, but no new progress. Next up is passing messages through
MessageWindow instead.
Merge branch 'curses' of ducklair:/home/tellus/git/sw406f12 into curse
Redirected err and expanded MessageWindow a tad.
Almost finalised ncurses implementation v1.

Added hotkey/information window.
Added titles to all windows.
Fixed and optimized window ordering and rendering.
Removed extra output from AbilityTable, Action and Effect.
Moved border/box drawing to window base (properly).
Redirected cerr (stderr) to a file, engine.log. Output is logged
there for debugging purposes since nurses takes up the terminal
during execution.
You can no longer step execution if the win condition is met.
Engine now defaults to SimpleWinCondition if none is given.
Code has been vastly generalised so that generated characters
could be used instead of the built-ins with less trouble.
Added .log files to .gitignore.
Merge branch 'curse' of github:/Tellus/sw406f12
Added preliminary ClanLib GUI files.

The CodeLite project I've bundled with it
for now (messy, yes) is configured to attempt to load the necessary libs at
compile-time. You need ClanLib SDK 2.3.x installed on your system with deps in
order to build.
Following Cherno's game guide up to episode 15
Merge branch 'master' of github.com:TomDiddle/ROTMG
updated Constants.groovy with new project repository url
Fixed login and register.
Error fixed while creating alert.
relocated a few more io classed to the io package and added a log statement to the copy invoker
Add cas-shiro-grouper web app
Illustrates another leak in the TableView
* Reported as RT-25338
Merge pull request #5 from UrsKR/anotherleak

Illustrates another leak in the TableView
Updated css
removed not required dependencies
Moved ArgumentClosureToggle into another project
Updated announcer to  addition of new listener while announcing
Vimrc: I'm glad @janmoesen pointed out he could move with arrows in visual mode.
Added class Listener
correctly installed vim snipmate
Not needed but it may still NPE.

Signed-off-by: Chris Sanders <zidane@outlook.com>
Merge branch 'master' of git@github.com:SpoutDev/Spout.git
When loading, it is returning a null player. Needs to be fixed

Signed-off-by: Chris Sanders <zidane@outlook.com>
Altered region entity manager to use message buffer

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Merge pull request #1974 from bergerkiller/master

Altered region entity manager to use message buffer
RegEx v4.1
www
Revert "www"

This reverts commit af06536e63157460533defcdcd364578003df78a.
DICTS
rt: Fix delegate orders
llvm: Make sure that functions are not reference values
llvm: Handle calls with CreateDelegate children
semantic: Hidden arguments shouldn't trigger an exptyper violation.
d
Merge branch 'master' of github.com:Wargo/Settimani
d
add a drop collection to clean all files
AssetLoadingException
merge
merge2
Merge branch 'assets_manager'
Removed multiple click functions
Minor wording fix for the English translation.

Translators are encouraged to incorporate the change into their translations.
MPEG Splitter: Don't output the fake "No subtitle" track when the file contains no subtitles.

This commit fixes ticket #2606.
fix a few cppcheck warnings:
* initialize var in the constructor
* reduce variable scope
* unused variable value
fix more cppcheck warnings
update ffmpeg (n0.8-13640-gc0dfc72)
Remove autosync option
Update sendmail.mc
Enable vi mode per default (this is an experiment)
Filestructure changes.
split apart tooltip styling ... not worth the effort of unifying for now
removed last update field
Added tabs to myself page
Delegated initialisation of sliders
Replaced profile implementation with a narrow table (user-meta)
ProfileMapper is not a type of UserMetaMapper - it requires multiple meta entries, split it
Sorted tabbed display
Completed details form display, no decorators changes for now
[Relooking] promise.js: Performance notes
[Relooking] promise.js: Documenting |then|
opera dirty hack
operation wizard progress
Port range changed
iptables rules updated
Texture loading now uses ImageSharp instead of (buggy on Mono) System.Drawing
add icons , check if the distro is RedHat based
Removed code pasta. Issue with showing non-static items in static class methods. Further tests.
Began with traits evaluation
Fixed ufcs method preference issue.

https://github.com/aBothe/Mono-D/issues/183
Small typeid() completion issue