labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed bug FPToSI bug reported by Peng Li.  Added a simple test case. 


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160547 91177308-0d34-0410-b5e6-96231b3b80d8
Added links to two more systems based on KLEE: Cloud9 and KleeNet.


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160548 91177308-0d34-0410-b5e6-96231b3b80d8
Documented several KLEE options.


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160779 91177308-0d34-0410-b5e6-96231b3b80d8
Forgot a cl::desc in the previous patch...


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160781 91177308-0d34-0410-b5e6-96231b3b80d8
Patch by Dan Liew: "fixed mistake in autoconf substitution variable name."


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160792 91177308-0d34-0410-b5e6-96231b3b80d8
Patch by Dan Liew: "Improved AutoRegen script so that it supports newer versions of autoconf"


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160793 91177308-0d34-0410-b5e6-96231b3b80d8
Patch by Dan Liew that adds support for building Doxygen out-of-source.


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@160795 91177308-0d34-0410-b5e6-96231b3b80d8
Patch by Dan Liew that removes our internal copy of STP, and makes the --with-stp option mandatory: 
"1. At configure time the --with-stp= option is now mandatory.
 2. The HAVE_EXT_STP macro has been removed.
 3. The ENABLE_EXT_STP autoconf replacement variable has been removed and consequently the Makefile variable of the same name has been removed."



git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@161055 91177308-0d34-0410-b5e6-96231b3b80d8
Forgot to remove the actual stp directory. 


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@161056 91177308-0d34-0410-b5e6-96231b3b80d8
Added another link to a system building upon KLEE, S2E.



git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@161057 91177308-0d34-0410-b5e6-96231b3b80d8
added getStopListFromTransportLine
publish-maven-artifacts: Xmx
publish-maven-artifacts: Xmx
Better checking for isMavenModule()
ReadMe: install -> package
Cache getting qualified name for package expression
Insert one additional space for function literals
Clean up function bracket insertion algorithm

- Rename methods
- Correct variables names
- Fix algo for searching open bracket
Few nullable annotations added in *Resolver classes
Rename: AnnotationResolver -> JavaAnnotationResolver
Refactor JavaDescriptorResolver and *Resolver classes to use DI for dependency management
Rename: *Resolver classes to Java*Resolver

Regenerate injectors
Remove unused dependencies from JavaDescriptorResolver
Cosmetics in JavaInnerClassResolver
Refactor JavaClassResolver
Extract JavaClassObjectResolver class from JavaClassResolver

Regenerate injectors
Extract JavaSupertypesResolver class from JavaClassResolver

Regenerate injectors
Minor refactorings in JavaClassResolver and DescriptorResolverUtils
Introduce PostponedTasks helper class to replace List<Runnable> passed everywhere in jdr
Minor refactoring in JavaClassObjectResolver
Move JavaDescriptorSignatureResolver to resolver package and rename it to JavaSignatureResolver

Injectors regenerated
das
Merge remote-tracking branch 'remotes/origin/TTT'
Clean up a few files in TCMalloc. Increase the maximum local block cache size.
Fixing the import statements for `Model` in README

The base class for models is called `Model` but in the README it was
referred to as `Document` and `model`. These are now fixed.
dodany komentarz testowy

patrz jak zmieniłem
make images on exchange link to the project info page
fix a couple edge cases in SuiteGenerator
Update gnuplot-mode recipe

Use github repository and eliminate shell-interpolation
Merge pull request #924 from mliertzer/master

Update gnuplot-mode recipe
* Image location
Add recursion prevention code to the deep freezer
// in app/Layout/default.ctp <-- should be plural:


// in app/Layouts/default.ctp
Fix doctest runs in main so that failure causes an error exit code.
* changed id to show AppView-Content
Update to JavaFX 2.2
Model refactoring
Model refactoring
Merge pull request #767 from dorkster/bugfixes

Add default absorb/damage/speed to engine/stats.txt
MenuHUDLog: replace arrays by vector.
Remove warning for memorywaste on tilesetloading.

Closes #766.
Merge pull request #770 from dorkster/bugfixes

Make sure all menus start closed
Merge pull request #771 from stefanbeller/master

Remove warning for memory efficiency (#766) and replace arrays by vector in MenuHUDLog.
Only display 'mod is requiring a minimum resolution' message when needed
Tuned down low-level creatures to be far easier
Increased XP awarded for elites and bosses
If loot is dropped in an invalid spot, drop it at the player's feet instead
Set title screen display to v0.16 Issue #474
Merge pull request #477 from dorkster/bugfixes

If loot is dropped in an invalid spot, drop it at the player's feet instead
Issue #479 fix for teleporting and blocking
Enable sigset_t under MinGW
Avoid multiple atomic builtin declaration.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164454 91177308-0d34-0410-b5e6-96231b3b80d8
Fix pr13749. There is still a lot of code using getArchName that should be
using getArch, but I will try to fix them one at time to add tests.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164460 91177308-0d34-0410-b5e6-96231b3b80d8
Use FileCheck.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164462 91177308-0d34-0410-b5e6-96231b3b80d8
Fix cindex.py compatibility with older libclang.so

The issue is that we were calling clang_getCompletionBriefComment
unconditionally.  New we check if this function is available before calling it.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164464 91177308-0d34-0410-b5e6-96231b3b80d8
Remove superfluous \namespace command.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164466 91177308-0d34-0410-b5e6-96231b3b80d8
Comment sema: warn when comment has \deprecated but declaration does not have a
deprecation attribute ('deprecated', 'availability' or 'unavailable').

This warning is under a separate flag, -Wdocumentation-deprecated-sync, so it
can be turned off easily while leaving other -Wdocumentation warnings on.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164467 91177308-0d34-0410-b5e6-96231b3b80d8
Use FileCheck.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164468 91177308-0d34-0410-b5e6-96231b3b80d8
Use pipes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164469 91177308-0d34-0410-b5e6-96231b3b80d8
On Hexagon getArchName() never returns x86_64, simplify the function.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164470 91177308-0d34-0410-b5e6-96231b3b80d8
Implement ToolChain::IsUnwindTablesDefault to reduce code duplication a bit.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164473 91177308-0d34-0410-b5e6-96231b3b80d8
Delete obsolete files. Change README
added shuffling
changed task wording. fixed randomization
Require jvm 1.5
Added callbacks module and set up button callbacks
bugfix: changed log, mel, and erb calculations to base-10 instead of base-e
Fixed cublas norm

Signed-off-by: Dirk Ribbrock <dirk.ribbrock@math.uni-dortmund.de>
update change log for 0.6.2
wordpress example app for future specs
Bump to 0.6.2
Add git attributes files for images and other files treated as binary
Fix bug #941 and improve empty values checking of params
Merge pull request #28 from shakaran/220921669114647ba0acf7a5bd050b866a254aca

Core git attributes
Merge pull request #29 from shakaran/bugfix-941

Bugfix 941
Update Language BR - Project issue #337
Update Language ES - Project issue #292
Exclusive latest patch Angel is working on.
Update Language FA - Project issue #315
Update Language FR - Project issue #513
Update Language NL - Project issue #57
Update Language PL - Project issue #274
Update Language RO - Project issue #347
Update Language RU - Project issue #64
Merge pull request #30 from dterweij/update-lang

Update lang
Merge branch 'dev' of git://github.com/lxcenter/kloxo into dev
update some conflict+
Merge branch 'master' of http://github.com/dto80/CDU_CMU2.git

Conflicts:
	src/main/webapp/WEB-INF/views/productpics/list.jspx
	src/main/webapp/WEB-INF/views/productpics/update.jspx
Arrumando o SHOW de veiculos
Well, this is...*better*... Still not very happy with how the copyright crap has been handled (by me).
Removed app_bootstrap.
made it log out when you delete your skier
Cleaned up tab's plus small bug
update readme
add unittests / update version
layout improved: creategroup and joingroup, stings improved
fix bug where multiple patterns on the same line were not printed
fix args.c to handle 0 args
убрана заставка, код получения всей инфы вынесен в отдельный класс
0.8r
план: 
нормальное выделение замен
стиль 4 для 2.3
практически нормальное выделение замен
добавлено выделение замен цветом
upd
Added Twisted to the requirements in setup.py

Conditionally use the install_requires parameter to setup() if setuptools is available; otherwise distutils emits a warning.
Bugfixes and Improvements

Updated readme to include descriptions, added dashboard, added maxlength
to ticket creation/editing.
Added unit test suites of mxPluginExec and mxv1
Test refactoring and Tests for reports and journals over rest-api
catch exception on main with param delete
delete method is not correct
webpage test is still empty
textile style
Update README.textile
Update README.textile
streams are stored in seperate directories
bug in ejournal ingester
webpage ingest first version. DigitoolDownloader enhanced.
webpage ingest first version. DigitoolDownloader enhanced.
webpage ingest first version enhanced
Delete objects as a admin Method
Delete objects as a admin Method
Delete not POST
WepageVersions and eJournalVolumes are no bound to their parents via belongsToObject predicate
travis
for travis
travis pic
test
Duda: cookie: fix iov_create() call

Signed-off-by: Eduardo Silva <edsiper@gmail.com>
added percentage graph
do not hardcode hostname i prompt
Turned off onfly syntax check

Appeared that it implies autosaving after each insert.
i am so failing honours..
OrientDbLoader: add local scheme only if not already specified
exclude inherited neo4j and orient deps and specify them explicitly
adds a simple laf switcher to toolbar, some fixes
adds import/export GraphML actions
one entry point for app wide preferences object
Change gemspecs to require rails 4 beta
Added Cuke, made some code changes
refactored rule files
can't fix image height and width
changed some of the color ... not very successful
unning "kinit --fast-armor-cache=xxx" against a Win2K3 domain resulted in a crash with the attached backtrace. FAST is not supported with RC4 keys which are used in Win2K3. The code already handles this but the error code is not propagated up the stack.

Signed-off-by: Love Hörnquist Åstrand <lha@h5l.org>
use productbuild
guess that this is how arcfour prf works
add socket_set_nonblocking
Allow krb5_verify_init_creds() to take NULL opt arg.

Without dereferencing it.  krb5_verify_init_creds_opt * to be
precise.
removed postinstall code as it is now in the dotcloud rake task
replace arange with equivalent linspace

linspace seems more clear here
Add speed constraint to tests
contact and about text
Upgrading version to 0.0.7
Upgrading version to 0.0.8-dev
Few bugs, testing

Some translations to English,
Assets directory structure.
Footer grid_3:first is not empty anymore.
Enhanced proxy output
Fixed net.scan output
Adicionado as Bibliotecas
load Examples through dataTable.
simplify (sequentialize) index loading
use datatable api to add and remove rows.
remove some unused code.
fix http cell
add default sorting for tables
relax authored docs counting to include entire database
Smarty 3.1.3
solved problems with xmpp session setup
merging latest a.rkt
Exception class for throwwing errors
Encapsulated Menu functions into DoodleMenuBar class
Removed old directory structure
key management added
Another pgsql fix.
Fix issue where nodes that were created after the widget was shown caused it to hide, because the test for nesting depended on ids
Methods defined in the node-data submodule will now appear on Y.Node
Optimized valueFn handling, so that valueFn is not called if user provides a value.

This was true for AttributeCore already, but this optimization was missed for
Attribute.

Also refactored tests into separate HTML and JS files, moving towards travis
testable structure.

See #2529337 Not closing the bug out yet, since I also want to add the ability
for ATTRS "value" from a subclass to override "valueFn" from a superclass (Y.View
use case)
Build for valueFn optimization
Added HTMLParser test for valueFn fix. See #2529337
Allow 'value' from subclass ATTRS to overide 'valueFn' from superclass hierarchy.

Previously, if a class in the hierarchy defined a 'valueFn', then it would
take precendence over a 'value' defined in a subclass, making it neccessary to
define a 'valueFn' in the subclass, even when a 'value' would suffice.

Fixes #2529337
Build for value in a subclass overrides valueFn higher up in the hierachy enhancment. Fixes #2529337
Minor perf tweak for Loader
Fixes #2532344 - array.sort being called on missing requirements that was changing the original array
Loader and Seed build for #2532344
Merge branch 'master' into build
Ref #2532322 - Temporarily fix the throw
Build for #2532322
Fixes #2529742 - Better messaging in status object of use callback
Better testing for #2529742
YUI build ref #2529742
Fixes issue where destroying a router stopped routers from dispatching.

All router instances subscribed to History events using the same
signature and detached their history event subs on `destory()`,
therefore the event system would unsubscribe all router instances from
their history event subscriptions.

Fixes #2532317
Build Router.
Update Router's change history.
Collapse white space between views when an App is transitioning.

This uses the same techniques as CSS Grids to collapse the white space
between elements, but is only concerned with browsers which support CSS3
transitioning natively.

Fixes #2532298
Add Friendlist type

Referenced here:

http://code.google.com/p/restfb/issues/detail?id=191
forgot to push 2.0 to github
COMMONS-190: Unified Search: rename package unifiedsearch --> search and class Index.java --> SearchEntry.java
CS-5869: Remove doc-style from ear file to avoid the duplication of chromattic lib.
PLF-3866: Update dependencies version for cs
[maven-release-plugin] prepare release 2.2.11
Initial Files Commit

Signed-off-by: Fabian Socarras <fa6ian@me.com>
Error message if project ID isn't specified
Merge branch 'master' of github.com:fac/ki_pivotal
Changed error message to be correct with --project syntax
first tab in forms should be active by default.
Geophp
Some changes
Merge pull request #7 from allash/dev

Some changes
rmove the vim config
add php snippets
	new file:   snippets/.aa.php.swo
	new file:   snippets/.aa.php.swp
	new file:   snippets/_.snippets
	new file:   snippets/autoit.snippets
	new file:   snippets/c.snippets
	modified:   snippets/codeigniter.snippets
	new file:   snippets/cpp.snippets
	new file:   snippets/html.snippets
	new file:   snippets/java.snippets
	new file:   snippets/javascript.snippets
	new file:   snippets/mako.snippets
	new file:   snippets/objc.snippets
	new file:   snippets/perl.snippets
	new file:   snippets/php.snippets
	new file:   snippets/python.snippets
	new file:   snippets/ruby.snippets
	new file:   snippets/sh.snippets
	new file:   snippets/snippet.snippets
	new file:   snippets/tcl.snippets
	new file:   snippets/tex.snippets
	new file:   snippets/vim.snippets
	new file:   snippets/zsh.snippets
update .travis.yml configuration file
Merge branch 'release/0.0.2'
Trim user name match when asking for a user
Merge branch 'hotfix/rolesFix' into develop
Remove DNSQueryTest
DNSQName: handle negative label length
DNSQName: account for "name pointers"
Perlito5 - perl5: add more operators
Alterações
Merge branch 'master' of https://github.com/fiapAm1/New-Am.git

Conflicts:
	ProjetoAM/src/br/com/am/action/CadastrarProcessoAction.java
tts.py system prompts added to EN,CZ

git-svn-id: http://open9x.googlecode.com/svn/trunk@1293 aa04c113-223f-6118-1b62-88c24e5be702
All python file(...) converted to open(...)

git-svn-id: http://open9x.googlecode.com/svn/trunk@1294 aa04c113-223f-6118-1b62-88c24e5be702
Issue 117 fixed

git-svn-id: http://open9x.googlecode.com/svn/trunk@1295 aa04c113-223f-6118-1b62-88c24e5be702
Issue 117 part 2 fixed

git-svn-id: http://open9x.googlecode.com/svn/trunk@1296 aa04c113-223f-6118-1b62-88c24e5be702
Italian tts fixes

git-svn-id: http://open9x.googlecode.com/svn/trunk@1297 aa04c113-223f-6118-1b62-88c24e5be702
Makefile -- hopefully this time I did it way that will work for every one.
(Thanks yet again Bertrand for telling me how.)



git-svn-id: http://open9x.googlecode.com/svn/trunk@1298 aa04c113-223f-6118-1b62-88c24e5be702
Issue 110 fixed

git-svn-id: http://open9x.googlecode.com/svn/trunk@1299 aa04c113-223f-6118-1b62-88c24e5be702
RX, TX say dB
Rpm say "turns per minutes"
AccXYZ say "g"
Hdg say degrees
VSpd say  m/s
Alt- say meters
Alt+ say meters
Rpm+ say "turns/minure"
A1/A2 and A1-/A2- say the chosen unit
A1- and A2- say the right value

git-svn-id: http://open9x.googlecode.com/svn/trunk@1300 aa04c113-223f-6118-1b62-88c24e5be702
Problem with timers after 10 seconds
Warning removed

git-svn-id: http://open9x.googlecode.com/svn/trunk@1301 aa04c113-223f-6118-1b62-88c24e5be702
Issue 109 fixed

git-svn-id: http://open9x.googlecode.com/svn/trunk@1302 aa04c113-223f-6118-1b62-88c24e5be702
Issue 109 fixed

git-svn-id: http://open9x.googlecode.com/svn/trunk@1303 aa04c113-223f-6118-1b62-88c24e5be702
ONm on stock board fixed
2s initialization time for voice module on stock board

git-svn-id: http://open9x.googlecode.com/svn/trunk@1304 aa04c113-223f-6118-1b62-88c24e5be702
Czech lang. updated tts.py and tts_cz.cpp

git-svn-id: http://open9x.googlecode.com/svn/trunk@1305 aa04c113-223f-6118-1b62-88c24e5be702
Issue 118 fixed
Another fix for SDcard setup on ersky9x board which should be quicker to initialize.

git-svn-id: http://open9x.googlecode.com/svn/trunk@1306 aa04c113-223f-6118-1b62-88c24e5be702
The Radio Setup Menu was badly displayed when STOCK board + VOICE Mod (problem with the cursor in the last lines)

git-svn-id: http://open9x.googlecode.com/svn/trunk@1307 aa04c113-223f-6118-1b62-88c24e5be702
tts_cz case M/Z/S

git-svn-id: http://open9x.googlecode.com/svn/trunk@1308 aa04c113-223f-6118-1b62-88c24e5be702
[ersky9x] Bluetooth FrSky proxy added (ported from ersky9x, still untested, not part of the release)

git-svn-id: http://open9x.googlecode.com/svn/trunk@1309 aa04c113-223f-6118-1b62-88c24e5be702
Code factorization

git-svn-id: http://open9x.googlecode.com/svn/trunk@1310 aa04c113-223f-6118-1b62-88c24e5be702
tts_cz UNIT_DB to UNIT_DBM

git-svn-id: http://open9x.googlecode.com/svn/trunk@1311 aa04c113-223f-6118-1b62-88c24e5be702
Update to work around issue 80 - better solution to be proposed shortly.

git-svn-id: http://open9x.googlecode.com/svn/trunk@1312 aa04c113-223f-6118-1b62-88c24e5be702
Added code for existing values to single plupload field
Changed how $PATH is calculated.

It now recursively find directories containing executables in the ~/bin/
directory. The nice part of this is that now a symbolic link to
~/Coding/Scripture can be made in ~/bin and all of the category folders will
automatically be added to the path.
Updated extensions and added Firefox 17
Has changed the "remove \n" method (rstrip! -> chomp!).
Merge pull request #52 from mazgi/pull_request/plugin_tail_line_break_fix

Has changed the "remove \n" method (rstrip! -> chomp!).
Set timestamps from Windows timestamp header.

When extracting on Windows, use the more precise timestamps from the
Windows timestamp header, if they are provided.
already corrected in dayz_code/init/publicEH.sqf

This EH redifines are no longer necessary because they are
already corrected in dayz_code/init/publicEH.sqf now.
prepared arrays AllPlayers &  AllPlayersVehicles

introducing global var arrays for fast access to all players and to all
players + all vehicles
so we can use it now for example:

count ((getPosATL _x) nearEntities [AllPlayers,_keepAwayDist])) == 0;

(instead of "CAManBase" which give us zombies back too)
Add set_detadata() function.
ein paar änderungen, lauft schon besser, wobei manchmal die agenten
nicht der ersten auktion teilnehmen wollen, ka warum
TODO dritter biet agent (strategie)
Bugfixes to sampler (not working)
Adding unit test which show that the number inference doesn't work as expected. References issue #176
Number inference works on int64 values - fixes issue #176
Adding student middleschool grade groupings (5/6A, 5/6B, etc)
clean up filters
initial delete and close logic
gentoo.org updates Fri Jun  8 12:01:36 MDT 2012 update
subv-0.12.427.11.crx against gdd/subv@cfebb26f8697f3eeee96af843f301ab20a6639cd
cxyv
Add config key to customize default 'Read More'

The user is provided the config key `read_more` which will set the
default text used for 'Read more' links throughout the site. If the
`read_more` config value is not set, the site will use the previous
default of 'Continue reading'. Users can still customize the 'Read more'
text on a per-page basis with metadata.
fixed possible property access attempt on undefined
add all exisiting source code
Change the vCloud 1.5 test fixtures details
Updated gen tele report code
redirect facebook
forget about gbuntu127/gcolor plugin
Scripts/AQ: Fix warnings (thx razhael)
DB/misc:

NPC Jezelle Pruitt Closes #856
Standards and Practices Closes #1539
An Improper Burial Closes #1977
Postponing the Inevitable Closes #2350
Rune of Dawn Closes #2782
No Rest For The Wicked Closes #4013
Gregory Tabor Closes #4350
Anatoly Will Talk Closes #4551
Pilgrim's Bounty Closes #5025
The Fallen Sisters Bugged again Closes #5419
The Lost Spirits Closes #5647
Feedin' Da Goolz Closes #5679
The One That Got Away Closes #5764
Find the Ancient Hero Closes #5785
Shattrath Daily Quests missing ExclusiveGroup Closes #5821
Nether Drake Egg Closes #6284
Quest - 28056 Closes #6627
Before the Gate of Horror Closes #5760
Quest Audio - 12593 Closes #6632
Souls of the Decursed Closes #6724
Norgannon's Shell (12872,12928) Closes #7837
Windcaller Yessendra (15498),Warden Haro (15499),Keyl Swiftclaw (15500),Mokvar (16012) & Deliana (16013) quests  Closes #7907
Attunement to the Core (7487,7848) Closes #7908
spawn location in OG near Rogg (37072) Closes #8021
Missing Fires for Hallow End Q  Closes #8086
Wickerman Festival NPC & GO's Closes #8133
Hallow's End Pumpkin Treat & Tricky Treat time fix Closes #8244
Exhausted Vrykul - not responding after using discipline stick on him Closes #8288
commitfix: add newline to prevent possible issues with next file
db/commit: NULL is a bad param, fixed
DB/Event: Pilgrims Bounty support, thanks to Vincent Michael
Commit: change SQL name to match indexing
DB/Misc: some cleanups
DB/Misc: Ysera@Emerald Dragonshrine should lay down and ground work on Bloodmoon Isle

Closes #8305
DB/commit: darn incremental number fail 2nd time today
Core/Calendar: Minor change.
Merge pull request #8359 from Warpten/calendarRo

Core/Calendar: Minor change.
Core/Pets: Pet "at rest" distance from owner is now closer as it should be

Original PR modified

Closes #8358
Closes #8181

Signed-off-by: Nay <dnpd.dd@gmail.com>
Core/Misc: Define some methods const
Core/Misc: Reduction of header dependencies - Step II
Core/ObjectMgr: Fixed crash on shutdown

Closes #8362
Core/Misc: Reduce header dependencies - Step III
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/server/game/Instances/InstanceScript.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Spells/spell_generic.cpp
[gc258] adding Title converter to faction converter, original author Silinoron
Scripts/Ruby Sanctum:

* Move Dark / Flame Breaths handling to generic_halionAI.
* Also apply Twilight Precision to Twilight Halion.
* Fix some mistakes in the corporeality handling code, and remove some unused enums.

Fixes #8176.
Fix PetAI missing aggressive pet target select
PetAI minor cleanup of target selection
Merge pull request #8259 from Warpten/supLion

Scripts/Ruby Sanctum: Tweaks and stuff.
Merge pull request #8330 from MrSmite/PetAI_TargetSelect

[Core/Pet] PetAI_TargetSelect
Core/Calendar: Completely rewrite and fix most of the calendar system

There are still some issues that need to be fixed, for more info see CalendarHandler.cpp TODO part.
Some unblizzlike behaviour possible, we don't have a lot of sniffs.
Big thanks to @Warpten, he joined my project and helped a lot.

IMPORTANT NOTE: Read / append packed time functions in ByteBuffer.h are not correct, they need to be fixed in order to have event times accurate

Signed-off-by: Nay <dnpd.dd@gmail.com>
Scripts&DB: Nexus - Ormorok

Following improvements:
- Spellscript for crystal spikes
- Spawn crystal tanglers with spell
- Usage of event map
- Correct usage of frenzy
- Heroic spells
- Target selection for crystal tanglers

Details for the spell script:
There are 4 spells. Each of them spawns the same trigger but in another direction. The trigger gets an aura which triggers the spell which summoned him after 250ms. This time is too long, so it triggers on apply. Don't worry - test ingame first, it's working blizzlike (I watched some videos on YT to find out which is the best amount of time difference between spawn and next summon).

Some summon types don't store the spell id which summoned them. The trigger is one of them which are not doing so. So I had to move the line, which stores the spell id in the summon out of the if. This could be done more specific, but it works fine. This improvement is required to find out which spell the aura applied to the summoned trigger has to cast to keep the right direction.

Closes #8193

Signed-off-by: Nay <dnpd.dd@gmail.com>
Scripts/AQ: Implement Ossirian the Unscarred

Fix yell on kurinaxx death

Warning fix

Closes #8254

Signed-off-by: Nay <dnpd.dd@gmail.com>
Scripts/ToC: Trial of the Crusader rewrite

Closes #8272
Closes #7013
Closes #7552
Closes #5561
Closes #4221
Closes #2701
Closes #2079
Closes #5082
Closes #6503
Closes #6784

Signed-off-by: Nay <dnpd.dd@gmail.com>
Misc: Whitespace and tabs cleanup
Scripts/AQ: Fix non PCH build
Scripts/Instances: Save Magister's Terrace door (and statue) state.
Closes #6889
Scripts/Instances: Added missing definition from previous commit.
Core/Battlegrounds: Add methods for determining the winner of a BG if it has ended due to not enough players.
Implemented for Arathi Basin, Alterac Valley, Warsong Gulch and Eye Of The Storm.
All other BGs winner are currently decided based on the number of players of each side, they will be implemented later.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
[gc486] misc fixes by garyfisher, not tested
Updating postvar database
Adding postvar form
build buttons from actions
Merge branch 'master' of github.com:geoext/geoext2
Update FeatureStore tests
Add empty getByFeature function
Update FeatureStore tests
remove unnecessary cast
remove unnecessary cast
add constant key
solved ticket https://issues.jboss.org/browse/RAILO-1870
add each function declaration
Updated the prompt for name/email.
cleanup child-process boilerplate in in require-tests
Another stab at fixing version detection in nodejs/child-process
more work on surface.sjs module
map windows paths to unixy paths (github issue #11)
fix rocket on win32
win32 apollo & rocket scripts by github/caizongchao
surface module refactoring & UIContainerElement::remove
surface module: animation aperture
utf8 tests
string module: base64 & unicode conversion functions
Fix require() 'github:' scheme for v3 github api
add comment
Change blocklambda call syntax. foo(a,b,c){||...} is now interpreted as foo(a,b,c,{||...}), not foo(a,b,c)({||...})
collection module: document alternative blocklambda syntax
ruby-like string interpolation
string api cleanup
shuffle around some tests; add detached blocklambda testcases
Standard Module Lib cleanup
module browser tweaks
surface bug fix
added js,css,imagery for bg_slideshow
2012-05-02  Basile Starynkevitch  <basile@starynkevitch.net>
	MELT branch merged with trunk rev 187035 using svnmerge



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187037 138bc75d-0d04-0410-961f-82ee72b054a4
Updates the minified version
Better balance message.
Move mechanize extension to ext folder.
Version 0.4.0 bump.
Un nouveau fichier traduit
add delete repo function
modified explanation
現在のrepo名を表示するようにした
機能追加のためversion up
Fixed votes status parameters
Removed outdated Zfc*-SubModules
Call server_client_lost from control_error_callback as suggested by Nick
Delete a print
Update the readme create a new release
PUT 時のステータスコードが 200 を返すようになったので元に戻した https://twitter.com/yaotti/status/256964503722397697
Update features/create_edit_category.feature
switches to xidle
various fixes, still problem with getLikeness on groups!
p4 submission
Merge pull request #1 from gregrob/test2

Test2
Merge pull request #2 from gregrob/look

Look
Additional work on AdminFeature (see Issue #24)
Issue 830: Fix get/modifyOperatingSystemSection tests
Patch for an Issue #44
Update Start Messages
Switching to solarized dark
Added asterisk pattern support for routing. Added static resource file route.
[modify]Nothing
Added buystock and sellstock in investments.
remove string_extensions
fix cannot set color if celleditor is active bug, add left tries to help text
changing lines into code lines

earning my shirt
Merge pull request #118 from josegonzalez/patch-1

changing lines into code lines
fixed Component::initialize() method definition
fixed Component::startup() method definition
fixed Component::beforeRender() method definition
fixed method name case
changed test directory structure for cake 2.x
fixed test suite directories
fixed loading schema into test db
Merge pull request #119 from okonomi/component-hook-method-definition-fix

Fixed Component hook method definition
Merge pull request #120 from okonomi/testing-fix

Changed test directory structure to cake 2.x style
Merge pull request #121 from okonomi/travis-fix

Fixed Travis CI Setting
removed note that using PHP5 syntax

This is remains that was using the CakePHP 1.3.
startup()のパラメータ＄Controllerの一文字目が小文字になっていた。
Merge pull request #122 from okonomi/master

Update readme
Merge pull request #123 from muneando/master

MailerComponet::startup()の変数名の間違い
Better ranges for coord_map gridlines. Fixes #689
Add visual tests for map projections
Merge pull request #698 from wch/fix-map-lines

Fix map lines
Cleaned up and commented core package.
tided up main screen and stats page and hooked up stats refresh button
Modified the outofmemory java heap space 2.
complete ComPtr
add colorstrap, fswikibs, kotatsumaho, online-generator
makin it all work
Merge branch 'master' of github.com:helioliu/vooga
Signed-off-by: liwen <hellocreep@gmail.com>
更改提交图片路径
Styling and placeholder icons for accessibility.
Add alt text from node title on lists.
Skip navigation link.
Get some better default keyboard focus rules.
Fix invalid markup.
Add language on node panes.
Hide availability markup.
Add availability icons.
Fix flaw in template.
add ugly project icon to uglify (not really) the README.md

Signed-off-by: Henrique Vicente <henriquevicente@gmail.com>
Use redo_clean_shutdown redo branch.
Proper detector vows
Merge pull request #9 from hfroemmel/6b3ce685746a45f8caa1d2c1a344934d537e93e8

Added the experts form & changed the form styles.
Minor changes

* Localized experts degree in experts table
* Respect the effect, that not every expert, has a user.
Merge branch 'master' of https://github.com/ushis/silo
Made the fee field to a text field & degree to a select box.
[CSS & Favicon] Added some styles & a silo favicon.
add missing header: unistd.h
Added cute octocat story
Add all the octocat txt files
Removed all the cats
Revert "Removed all the cats"

This reverts commit f8096d9f1160c6e10ee555ff160a4c56ccc37883.
Revert "Revert "Removed all the cats""

This reverts commit f54bfdbe97fad62c9f7db26a46e97a892b32dec5.
Merge branch 'master' of https://github.com/hhhyde/try_git
test
HttpServerTests: don't use a certain port to test, but find an available one

This is because that port may be in use by something else in the host
where the tests run (internally in 7d this was failing in buildagent009
but not in buildagent001!).
Merge pull request #11 from knocte/fixOtherFlakyTestBecauseOfUsingACertainPort

HttpServerTests: don't use a certain port to test, but find an available one
Cleanup compiler warnings for unused variables
Allow variable extra wire chamber dead neopentane volume due to window bowing
Added SuperSum plots for backscatter types
More options in PMT signal noise simulation
Include run calibration info in qOut file
Merge branch 'master' of github.com:hickerson/UCNA
Fixed creating _tor user in RPM-based installs.
MapView実装
dhshdhf
build: rename uv.a to libuv.a
Switch build system from gyp to cmake.
Modify CMakeLists.txt for commit 47b2cd31c9b7372553e7687cd3c156d302695e59
Commit teste
Versão rodando. Referências resolvidas e atualizadas
add a skeleton avlFind
more work on iadd, and changing the find func to what I need
scaled tag cloud based on number of entries
Last Viewed button added.

Button icons added
Alignment/styling edited
All are now FirstOrDefault
完成死锁/调度/等测试。
Fixes for phase-3 slider keyword tool.
Code Refactoring. Updating Response Directory.
Add python instructions to readme
start integrating eyelink and stateMachine, we will use a transition
function that will allow the state machine to query an input for some
method and if a state name is returned then that triggers a transition.
This allows the eyetracker to tranition the stateMachine to start a
trial, abort etc, but the logic will be in the eyetracker not state
machine. This allows a mouse to simulate the eyetracker etc.
The assert is "is_numeric" not "is_num"
Dinamic pages
kdiff3: new kde3 modules structure support.
Fixed collide with self bug, made smaller level
dynDynamicRelaxation - trying to get curve import to work, having trouble with ref point matching
Merge branch 'master' of https://github.com/ikeough/Dynamo.git
turning on point and particle comparison logic again.
also adding first working recursive example of this (thanks stephen)
turning on point and particle reference testing in more cases.
Add money.subtract()
Version bump
Forgotten doc update
refactor
fix header files
Add some missing explicit types.
Make __singleton_instance a private member.
Patch constructor to set __singleton_instance.

This ensures that every time we call the constructor the singleton instance is
set, so we can't forget about it someday. This also removes the assignment of
the singleton instance when accessing values while the class wasn't
instantiated.
gc: do not rely on heap()->needs_gc() stability
Moved CScriptClass / CScriptAssembly reference incrementing to the TryGet methods.
Fix: Properly release remaining class and assemblies on shutdown.
Removed ScriptType.ScriptCompiler.
Added CryScriptInstance.Script.
Added Texture class
Replaced LightSource with Entity.LoadLight, fixed entity linking.
Added Entity.OnPropertyChanged callback.
Fixed color editor properties.
an emacs slime SWANK server for Chicken Scheme
the original swank-clojure.rcp will result an http 404 error. this is a patch modification
FIX: remove dependency that doesn't exist
Merge pull request #831 from intinig/master

Adding new recipe for bundler.el
Add contrib to eproject.rcp's :load-path
Fix run-test.sh and run-test-interactive.sh

Otherwise, run-test.sh fails with the error:
(file-error "Opening output file" "no such file or directory"
"/tmp/el-get-test-home/.emacs.d/el-get/.status.el.old")
Fix el-get-package-name/symbol
Check if update is needed when merging status
Cache el-get-status-cache
Merge pull request #833 from tkf/fix-run-test.sh

Fix run-test.sh and run-test-interactive.sh
Merge pull request #834 from tkf/smart-merge

Smarter el-get-merge-properties-into-status to fix slow startup
Merge pull request #832 from tkf/eproject-contrib

Add contrib to eproject.rcp's :load-path
Add more properties to whitelist
Some editing of the changelog, release is Real Soon Now
Make docstring for the whitelist clearer
Merge branch 'master' of github.com:dimitri/el-get
Merge pull request #836 from tkf/more-whitelist

Add more properties to el-get-status-recipe-update-whitelist
el-get-http-tar.el: Fix handling of single-file, no-directory tarballs.

Why anyone would use one is beyond me, but that's how rnc-mode is
packaged, so...
Recipe for rnc-mode, for editing Relax NG Compact schemas.
Merge pull request #838 from SamB/rnc-mode

Add a recipe for rnc-mode
Documnetação site
Merge remote-tracking branch 'origin/master'
Formula dir added
Shows little profile of users.
bootstrap assets
Revert "Revert "Fix bug which didn't minimize all windows after spread function""

This reverts commit 6ddcbd22d05d741910cd46aeed9f164bd3067143.
removed organisation resource
Added term_desc field to state model. Added to returnables as AtomStateDescription. Cleaned up the mapping file a bit, did some other cosmetic fixes.
Merge pull request #58 from Griatch/master

Added new field to VALD
ignore rubinius folder
cleanup steps
updated readme
Use released version of JaCoCo
stub thor commands for testing, and lifter binary for submission
install file for submissions
readme
stub in task to simulate a solution
task for specs
basic simulator, no environment
simulate rocks falling, lift opening
simplify internal map format
update atomically
push rocks around
squish robots
higher order rock test maps
slight score refactor
extra termination guard
switch score output defaults
solver stubs
accessors for solver
fix lift opening logic
handle multiple commands to tell_robot
update won calculation
Update src/i18next.translate.js

allow passing namespace as an option.
exemple: 
console.log(i18n.t('message', { lng: "en-US", ns:'ns.mynamespace' }));
Merge pull request #36 from alaa-eddine/master

a tiny modification allowing to pass the namespace as an option
Updated docstrings
Added test demonstrating issue #4
Added another test and also now do type checking on construction. Fixes #4
minor fix
remove photo ^^
changed event service to use double for coordinates
Thu Nov 22 16:04:39 MST 2012 - Fixed bug in _cookie.retrieve() function when multiple cookies exist
fichier added
Merge https://github.com/jasp-/cao_tme4
Platytime after J: added locale column to products database, protuct description in store depends on locale.
refactor MMU
added 829px width to tables in Mechand
fix changes to mechand
sending chatMessages now works
Added .gitkeep to a few directories
provision proxy settings test out some base packages
install gfortran
tweak deploy script
Added base domain, controller and views for searching and reviewing copy.
bump arquillian version too
change tmux prefix key to C-o
Treat MAX_CREATES_PER_MINUTE as a float.

The MAX value is an integer, but was being divided by 60, and so
was producing an integer result.  Therefore, if MAX was < 60,
the result is 0 and no new metrics are created after the initial
MAX is hit.  If MAX is >= 60, new metrics will be created, though
not at exactly the rate that would be expected.

The TokenBucket expects floating point values, so force the
division to be floating point.

Fixes issue #55.
* Bugfix for double results in "show own posts"
* Don't put user_id in GET -> use request.user
* remove {% if results %} with {% for %}...{% empty %}
* Refactor search()

Fixed topic search results which returned nothing.
Return a list instead of a generator in TopicFromPostResult.__getitem__() so that the pagination can work correctly.
from: https://bitbucket.org/hsoft/djangobb/changeset/1b2f31c54c516c699a7b11a1d43b170742157df5

use the slow, but correct solution for display the result as topics

used fast solution with a work-a-round for double topics

respect sort order

count only one time

better solution, but slow with woosh and many hits

change info

make it DRY

remove debug imports

remove not needed tuple()

* add "show your topics/posts" search
* add link to switch between topics/posts search
* merge {% block controls %}
* make search_posts.html useable with queryset and SearchQuerySet

Add topic <-> post switch links to other type of search, too.

not really in GET needed.

* Use PostSearchForm() in normal search
* add switch links to normal search, too.

better docstring

better text?
fci-mode now is global
Add projectile
Add inline-string-rectangle
Just move 2 key bindings
Smex's history is saved properly
Set rating of new feature to 1

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Move Facebook login to new session view

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Add login via VKontakte

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Cleanup

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Add auth via VKontakte

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Correct issue of plater background being dark for whole window
Display IP address along side server name in server list
took away classes on ending footings
conky font, berc alias, .git ll output
working on minimax ai
Add the ethtool to an eth device.
Make the diff output better.
Refactor to maker parser easier to understand.
Change the sls layout some more.
Return the ethtool opts in a way I like better
Add slave to type of interfaces, formatting.
Setup salve and bond ifcfg scripts.
Setup out slave and bond in state.network
Change sls proposal.
Round the DevDetails instead of DevComment if there are some details.

Created a new DevBottom for rounding which is attached where it fits.
Modified the examples a bit
SVN_SILENT made messages (.desktop file)
SVN_SILENT made messages (.desktop file)
Merge remote-tracking branch 'kde/master'
Checkin late august
CS-14955: security_group.py only creates ICMP iptables rules for
ICMP type -1

Description:
Unindented 3 lines to update logic flow to execute iptables when
passed ICMP type is not -1.
Restored accidental delete
das racist, yo
Desired Tenders continued
Version to 0.12.1 release
Bug logfile string absolute path in restart fixed
Fixed single node, multiple char matching.
aen gang til
fixed workarounds on stroke-fill parenting.
Adding unwatch
Adding State.once
jsDoc fix
Merge pull request #3 from westonruter/master

Adding unwatch
add task to ease transition
MDL-29626 backup - fix restore of links to course page to behave like other links
MDL-28170 environment - add new 2.2 section

nothing changes from 2.1 as far as it was agreed that this will be
the last version supporting 1.9 upgrade. See issue for details.
Merge branch 'MDL-28170_19' of git://github.com/stronk7/moodle into MOODLE_19_STABLE
Merge branch 'MDL-29697-Fix_incorrect_error_msg' of https://github.com/ncsu-delta/moodle into MOODLE_19_STABLE
weekly release 1.9.14+
weekly release 1.9.14+
MDL-29925 fix calendar parameter handling
MDL-29991 MDL-27107 auth_mnet - consider all incoming roaming users confirmed

Moodle 2.x sites do not send the 'confirmed' field any more (see MDL-27107). We
consider all roaming users confirmed automatically.
Merge branch 'w43_MDL-29925_m19_calendar' of git://github.com/skodak/moodle into MOODLE_19_STABLE
weekly release 1.9.14+
MDL-29092 login/change password: backporting to 1.9 for MDL-26381 and set form action to user https when loginhttps is enable
MDL-30038 mod_lesson was not working on PHP4.
MDL-29977 MNet does not allow to start a remote session when masquerading as another user
Merge branch 'MDL-29977-mnet-masquerade_19_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_19_STABLE
MDL-29529 Assignment: Fix regression (order by status) caused by MDL-27638
Merge branch 'MDL-29092_m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE
weekly release 1.9.14+
MDL-29551 Fixing ip_in_range function
MDL-29893 Fixing issues with password generation function
Merge branch 'MDL-29551' of git://github.com/ankitagarwal/moodle into MOODLE_19_STABLE
Add error logging to requests.
fixed bug in dbaccess code
First try to make requirejs compatible
Fix headline
Register as named modules
now sending json
aowsejifoaisefjaosjfaosijfaowijefawoeifja
Adjust block spacing
Small bits of cleanup
Various cleanups
新增函数重载工具
made walk sprint, and sprint even faster
going to check if merged with mster
Merge branch 'master' into escalation-structure-fix
code upload
added mechanism for notification workorder handling
corrected tests
synth wip
synchronizing synth gen and playback wip
split synth source file
tracker/note wip
Added a feature to enable/disable the sending of camera orientation at the client side. By default, the client does not send camera updates. If the server has IM enabled the server commands the clients to start sending the updates, if the client supports it.
test_deg_rate_nuclide => test_deg_rate_nuclide_
test_deg_rate_nuclide => test_deg_rate_nuclide_
Inscricao de pessoas nos sorteios OK
(#4561) Fix some tests after renaming facter_output
(#4561) Fix debug and timing colors to use Facter::Util::Colors
added rsSYnc.py, to detect changes in syncing locations
Moved scripts to master
修改
代码重构，增加分页支持
Attempt at reducing CSRF tokens
Update Mosh paper to final draft
Calculadora
Novos recursos
When translating an IL switch statement, wrap it in a block statement to enable some additional code generation changes
Add a test case overing a quirk in the way Mono generates code for enumerator functions
If a switch case contains a label, hoist the body of the case outside the switch statement so that gotos can target it safely.
When adding an unlabelled block statement to another block statement, fold its statements into the parent block.
Change DeoptimizeSwitchStatements to do recursive replacement in the parent function instead of walking a set number of steps up the stack.
Overhaul the logic for de-mangling field names.
Add a hack to LabelGroupBuilder so that it doesn't stop collecting statements when it hits a switch exit label.
Fix the switch statement hoisting logic not inserting a jump to the exit label after the switch statement.
Fix broken isPlaying in webkit audio backend
Fix XNA3 spritebatch setting the wrong default blend state.
Implement get_IsContentLost for Texture2D and RenderTarget2D.
Implement Dictionary's IDictionary ctor
Checkpoint preliminary touch input support
Handle duplicate entries for files in the content build journals
Fix bug that caused functions with pointer-typed local variables to not get entries in the function cache.
Fix ContentReader.AssetName containing forward slashes when XNA code expects backslashes.
Fix incorrect presence check for initTouchEvents.
Fix List.Sort using the wrong name to invoke IComparer`1.Compare.
Fix regex MatchCollection.GetEnumerator
Add basic implementation of regex Match.Groups
Add basic implementation of regex Group
Fix Queue and Stack's Clear methods not properly clearing the backing store.
I'm a moron.
Move test_runner.html and nunit tests to using JSIL.js to load libraries just like the browser harness does.
Add an 'environment' setting to jsilConfig that specifies the runtime environment to load in.
Add a new 'spidermonkey_shell' environment that supports running JSIL applications from within the command line spidermonkey shell instead of the browser.
Add some optional diagnostic input/output tracing to Evaluator
Change how GenericIgnoreTest looks for JS errors
Report error stacks if available in JSIL.Host.throwException when running in the shell
In automated tests, wrap unhandled JS errors with stack information so that it is easier to debug them and automatically detect them.
Load JSIL.XML in shell environment
Split parts of JSIL.Core out into separate files
Merge branch 'master' into lazy_cctors

Conflicts:
	Libraries/JSIL.Core.js
Updating build to work with newer versions of rebar
fixing bug
make sure titan container work if there is an exception in lifecycle
fixed add track / set track sample bugz w/ mutexes
Remove extra empty line and my ocd issue.
Added "gameplay"
added zlib, changed README
kings - added some tests for command parser and fixed relative paths for testing to work
DRY up code some more
Merge pull request #3 from buddhamagnet/master

More code DRYing
spec: add validation for large default number of trials
XPS: clean up image_jpeg.c error handling
revision of sec 1+2