labofsahil/github-event-dataset-2012 huggingface dataset:
fix GraphClientTest#testCentrality, GraphClientTest#testShortest_path
Controllers subscribe to model pub events on their own channel

Working in Indium / ri-app
Merge pull request #48 from st3redstripe/multiapp

Controllers subscribe to model pub events on their own channel
Rename driver directory to driver-faa, update integrate script to reflect that.
Correct links in presentation.
added empty NutritionDisplayActivity class for the obvious reason
added displayFood field to resultsview
stuff
added strings for calories, calfromfat, etc.. and have begun work on getting the results displayed
merge
working on display still. connections seem to be broken :(
connection is broken
fixing connection...
merge
added method to list all computers as a CSV
allow setting of a default location for new computers
Added flag to allow computer add itself to the database
Stretched background to fit screen
Made chains fade gently into the night
Rebase from 'release/bondpy' @ version '1.7.7'
Generated debian files for oneiric
Ajout du lanceur jetty pour eclipse
try putting it in head
history update
bump to v0.2.1
Parsing function added + docs and sysslog messages edited
Data-related functions moved to the separate file
Yeah, it's working!
Adding hex colors

Weird stuff is happenning. Weird stuff that shouldn't be happenning
removed all but engine
Added project.xcworkspace
paginate ban list
Initial commit

This should have been done earlier, but better late than never!
Switch build to x64
Add ignores
Strip values to remove end line break
remove explicit ivyxml for orbit dependency
Layout an dem Beispiel von Plesk angepasst. Navigation hat eine statische Breite. Header, Hauptinhalt und Footer hingegen sind flexibel und passen sich der Fenstergröße an.
DOC: add doc on making a release
Updating the read me with a link
Updating the read me with a link
Merge branch 'master' of github.com:scommab/meaningful-chance
Added in sharing buttons
Major README update
platforms are coming along now only need to finish off height aspect
Added surrogate model discussion.
Clean up holdings.
Update ser2-src/collatz.ser2
handle nil keys
One more fix in issue #555 -- fixing major typo in heading
Adding list indentation to bolds and italicies when they are the first content of a line
Added 'is None' checks to prevent FutureWarnings
packetHandlers updated to packetHandlerSpec
redirections handeled
Arnav - Schema updated
Arnav - Modified travis.yml to run migrations before test db setup
Lastenheft upgedatet
Adding data tags to each object
support array as parameter of finder (OR)
add Docs
update version to 0.3.5
added reply to ad by email functionality
Fix for #303 - Disabled is, exists and nonempty expressions because of
lacking type narrowing for then expression.
Tests for #303 - Disabled is, exists and nonempty expressions because of
lacking type narrowing for then expression.
Tests for InvertIfElse quickfix proposal
Hente ut alle ansatte
Updating bundle generator to provide skeleton for html files
Merge branch 'master' of github.com:snowcap/SnowcapCoreBundle
modif web.xml pour prod
Only build rails3 branch on Travis.
ImageResource.
NEW - # 229: Separate Story into com.soluvas.story 
https://bitbucket.org/bippo/bippo-commerce5/issue/229/
location home data binding
user version number ONLY in correct twitter api calls
Added tag 1.0.0_beta4 for changeset 0a20fbd13de5
Build improvements. Use GCC visibility. Update to UTF-8 NamesList.

--HG--
rename : m4/ax_check_compile_flag.m4 => m4_ax/ax_check_compile_flag.m4
rename : m4/ax_pkg_swig.m4 => m4_ax/ax_pkg_swig.m4
rename : m4/ax_python_devel.m4 => m4_ax/ax_python_devel.m4
rename : m4/ax_swig_python.m4 => m4_ax/ax_swig_python.m4
Fix indent.mk.
Much updating. make distcheck currently fails in the tests, though.

--HG--
rename : indent.mk.in => indent.mk
rename : tests/GNUmakefile.am => tests/Makefile.am
export.txt -> roster.txt
tests changes (27.09.2012)
tests changes 2 (27.09.2012)
Merge pull request #26 from stevanr/master

tests changes (27.09.2012)
Fix timeouts for ast_waitfordigit[_full].

ast_waitfordigit_full would simply pass its timeout to ast_waitfor_nandfds,
expecting it to decrement the timeout by however many milliseconds were
waited. This is a problem if it consistently waits less than 1ms. The timeout
will never be decremented, and we wait... FOREVER!

This patch makes ast_waitfordigit_full manage the timeout itself. It maintains
the previously undocumented behavior that negative timeouts wait forever.

(closes issue ASTERISK-20375)
Reported by: Mark Michelson
Tested by: Mark Michelson
Review: https://reviewboard.asterisk.org/r/2109/
........

Merged revisions 373024 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/10@373025 f38db490-d61c-443f-a65b-d21fe96a405b
confbridge: Update online XML documentation.
........

Merged revisions 377212 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 377213 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@377214 f38db490-d61c-443f-a65b-d21fe96a405b
improved ruby/versions/ruby-vips.rb
Fixing the charset issue that might happen with some sass partials that are being imported
Clean-up of formatting.
set the LC_ENCRYPTION_INFO->cryptid to 0
simplified patch
revert debugging output
Merge pull request #2 from emonti/master

set the LC_ENCRYPTION_INFO->cryptid to 0
Fixed abstract bug (dodgily, todo clean up)
Images added
Arrow buttons code and readme added

Arrow buttons now increment and decrement the slider
Fixed local defect 5

Порівняно з даними на booking.uz.gov.ua. не співпадає час (на годину
менше)

З'являється після 28.10.2012
baseActivityに共通処理をまとめる仕様に変更
Added bitset_copy.
Handle situation when openss_pkey_new() cannot generate a private key by throwing and exception. Tests now skip in this scenario

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24707 44c647ce-9c0f-0410-b52a-842ac1e357ba
ZF-11910: Zend_View_Helper_HeadMeta fatal error when no View object is set


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24776 44c647ce-9c0f-0410-b52a-842ac1e357ba
Allowed badge to be null

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@25154 44c647ce-9c0f-0410-b52a-842ac1e357ba
Added test/ dir with files for testing shell.cpp and updated Makefile appropriately. Added 'files' section to README
PrijzenForm gefixed en andere warnings weggehaald.
Merge branch 'master' of
https://github.com/swordbeta/IPSEN2-INF2B1-3.git

Conflicts:
	src/controllers/PrijsFormController.java
	src/views/PrijsFormView.java
Changed overlap/dist value to show max value (relative to all other
collisions)
change locations data into separate pieces of data
Crear flujo, static arreglado, urls tercera iteración agregados.
Merge branch 'master' of github.com:tamerdark/flujosdetrabajo

Conflicts:
	unidades/urls.py
fix dialog style for jelly bean
Changed token to signature.
p4 50% complete
baseapp changes for locux
Merge branch 'denzil' of git://github.com/Freescale/meta-fsl-arm into denzil
create day 3
prototype of the new console view
Fixed Issue#41 rack machine listener

IRackMachineListener change to OnMachineChangeListener
some ignores.
fixing bug created by renaming $id in get method
Make today the default for movie form
grow type stroke width. resolve o problema das sobras do shape
temp commit
temp commit
carregando scripts no final do body
fix indent
remove "$ ->" wrap
fix message
refact
add history nav bar (html)
add function - atualiza o campo do index atual do shape
atualiza index do shape (barra history) ao criar novo shape ou navegar para outros shapes
add navegação por keyboard - espaço: novo shape; z: anterior; x: próximo
refact
atualiza index do shape history ao clicar em botões de navegação
refact
refact
refact
update shape history approach
refact
update buttons bar layout
Upload coffee-and-books photo.
Renamed split component
Fixed the glitch in long trains and close components.
Worked on Split component.
Fixed merge conflicts

Merge branch 'master' of github.com:thomasahle/TrinityProject

Conflicts:
	core/src/main/java/com/github/thomasahle/trainbox/trainbox/scenes/LevelScene.java
	core/src/main/java/com/github/thomasahle/trainbox/trainbox/uimodel/UIDupComponent.java
	core/src/main/java/com/github/thomasahle/trainbox/trainbox/uimodel/UILevel.java
Adjusted to Vaadin 7.0 Beta 3
Merge branch 'master' of github.com:thomasletsch/javaee-addon
bugfixes for fit-to-content-width zoom mode for documents with pages of different size
clean-up
G_height -> height
Merge pull request #574 from kai771/fcw_bugfix

bugfixes for fit-to-content-width zoom mode for documents with pages of ...
ChangeLog init README.textile: 0.8.2 version bump, stabilized init-0.8.x
use unsigned ints not big ints
missed % off the centering rule
Removed new line in description meta
Debu statement inserted into BUILDER to dump $response from createFMeasure

Signed-off-by: Tony O'Dowd <tonyatdcu@gmail.com>
Fix for unsafe hostname determiniation
Merge branch 'master' of github.com:piersharding/moodle-google
add Moodle proxy settings for CURL
Add gapps domain related specific login screens
Google specific login screens
retired repository/googlelinks
add logging to auth/gauth login
retired repository/googlelinks
scheduled worker can only be run in foreground
tweak json
Wider range of functionality for iOS slider. Working on allowing touch devices to harness the recreation.
Finished photoshop version of arrow.png; returned sliding gradient back to original slide.
Added Olimexino STM32 and OpenOCD support

Changed makefile for other board, and added some openocd stuff for
programming and debugging
introducing validation project including @CompareObjects for Validating
Fields of type Object.
Add support for extracting/auto-linking cashtags
Merge pull request #36 from twitter/cashtag

Add support for extracting/auto-linking cashtags
added comment to check if commiting works
Multi Node testing
Make multi-jvm run all tests even if there is a failure
Updating sbt-assembly and publishing M4
Merge branch 'master' into sbt-0.12
Update to sbt-0.12.0 and fix for changes to Tests.showResults
Added udp configs
Andamiaje del panel de control
build v0.6.7
Initial commit of Elasticsearch script and Zabbix userparameter.  Template to follow.
Merge pull request #72 from unv-annihilator/master

Fixes a lot of issues, Finishes Edit button code.
added hyperlinks to the logos
Y u rename?

Removed rename line to prevent downloading minecraft jar upon loading a
new modpack.
Added getO functionality
Merge branch 'master' into peter_mg
Fixed recording script
minor changes to getO
commit code
Version bump to 0.1.8
commit gemspec
commit code
Version bump to 0.1.8
commit gemspec
commit code
Version bump to 0.1.8
commit gemspec
Move static libraries to a lib folder, change references in templates.
[#PSCFV-5720 transition:731]
Corração com o Internet Explorer
Workaround for media.dev.js radio button jQuery selector bug?
Fix settings.py for Django 1.4
Incluido o README
Reorganizing silex directory (add used components)
Added scientific calculator buttons to calculator demo
merge2
Merge branch 'master' of git@github.com:vitality1987/Projekt_IT11.git
backup update
Merge branch 'master' of github.com:vytautasgimbutas/dotfiles
Adds more structure to the abstract httpTransport
updates to the tests to call the transport
Fixed httpTransfer typos
Adds tests and transport stuff
BUG in Simple Form: show action & unset attributes
fixed MarketVisit to pass audit
Commited provenance traces for workflows from 21 to 35.
Fixed Dynamic Torch

Dynamic Torch wasn't showing creative tabs.
fully tested profile model and partially the registration controller
Blitz gateway imports Image from PIL first. See #9790
Make sure user is a member of destination group (see #8974)

An admin can move other users data. Check the groups the
user is member of.
Blitz chgrpObjects supports Plate link to Screen. See #8339
修改列印动作按钮，没有图像设定时显示默认透明图像
lalal
Merge branch 'master' of github.com:wukchung/Home-development
fixed typo and link
merging into single getData.php for both init and api.
Use protocol as context for cluster network and connector
add remote controls handling

play/pause from headset
add icons
fixed inline queryset
Min height in EDlist
删除无用界面
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/DeliverySpace.git
base link cleanup
Changed stylesheets to replace skew() transforms with skewX() and skewY() transforms since Firefox and maybe others will not support skew() in the future.
Shift article date closer to the title.
Switch back to solarized light.
Quick update to latest collection
bumped version number
Merge branch 'release/0.1.0-beta' into develop
Site updated at 2012-10-25 18:49:55 UTC
verdict functions changed
Did a bit of work on some internal structure. Still nothing really notable
happening, but hopefully that will be changed with the next commit.
Whoops, still getting used to Git - this commit is actually what the
previous log entry refers to. FYI: basically just added a bit of
structure. Still no functional differences yet - this will hopefully be
fixed in the next commit.
Adds AbstractObjectTracker
Renames ObjectTracker to TuioObjecttracker
Removes TuioStuff from main app
Renames BarticleApp to VisualizerApp
Makes visualizer abstract
Updates Visualizer functions
increase sdk version number
Merged new readability func. Upgrading tag.
Implemented Pearsons formula.
Added the recommendations method.
Implemented the exclusion function.
Fixed obsolete elseifs
Sorted recommendations and large data file
Merged
Pearson is now a class
Added Category.setSlug and removed sluggable behavior
Bad zarboz
Octopress init
Site updated at 2012-07-10 11:26:06 UTC
Added related posts feature (beta)
Fil for å koble til database. Lag en lokal_config.php som er lik eksemplet i filen for å bruke
I moved some files about to prepare
Merge branch 'master' of github.com:BlackToppStudios/Mezzanine
I am prepping for switching to the most recent pugixml from svn
I update the copyright on most source files and added much verfication to the PugiConversation.sh script. This will not compile with XML support enabled, consider it broken.
I think the new pugi updates are in and working. Seemed to convert pretty smoothly.
I partially corrected the directory creation code in the resource manager
Add quality spec and release script, fix gemspec

The `git`-style of finding what files to include is a bit overzealous,
especially in the case where certain files shouldn't be included in the
gem. I turned it off in favor of globs.

Additionally, I added our beloved quality spec and release script.
config: build rsync

Change-Id: Ic88bb9848074b7ee87e3182f46fb1865d04f6033
APN/FIX: typo in german O2 apn

Change-Id: I2aac5e52b6f236ef652314b96510b6de2401b844
Commented out relics from Joses last commit to make functional again.
Updated To ISO-C++ Standard
Merge branch 'master' of https://github.com/Brandon-T/Purely-CPlusPlus
Changed URL printout to Log to be its own line, so its easily
copy/paste-able into a browser to test the response.
Added change to preference descriptions when the user changes the
preference.
Added better async task handling, including on cancelation and progress
bar state handling.
game lab 01
atdd link to my blog
links to stephan-schwab.com
google verify
tracking code
Merge branch 'master' into team-coaching
new index page
reorg main page, add org-tech-caps
reorg done
Attempted to resolve memleak by changing Components constructor
Specified Compatibility profile and GL3.3 in GLUT
Merge branch 'master' of https://github.com/CaterHatterPillar/PACMANIA
redundant
Doc: changed the path to the images again.
refined function findLeadingEigV
upd srm2
fix Issue 7174 - Cannot use property function call as static if condition
fix Issue 7274 - Cannot use property function call in pragma declaration/statement
fix Issue 7275 - Cannot use property function call in case/case range statement
fix Issue 8251 - Property function call without parenthesis fails when it's passed as template argument
Merge pull request #599 from 9rnsr/fix7174

Issue 7174,7274,7275,8251 - Cannot use property function call in some where
Add a "BlackJack" pointer to player so we can tell the game that the player did action X;

Changed underlying vector of cards in Hand to pointers of cards
user signin authentication
Adding Galaxy Tab 2 7.0
Add Missing Sql
Fixed regex compilation error reporting
Regex search for key in get_rand
Added key regex parsing when loading config
Fixed rules queue insertion order
Started multi-poly support
Merge branch 'master' of github.com:Detegr/pwskoag-modeleditor
added documentation and found an error in the time stuff
shiz

Renamed rep.html to reportasje.html
Copied correct header for all pages
Avoid launcher duplications due to editing already added ones
Timesheet id serialization
Change variable's name on gugli's script.
Add different dialogues once the player has seen Nard on Gugli's script,
Clean nard and gugli scripts.
Remove duplicate lines on nard's script.
Correct q'onan script.
Initial snapshot commit of VRay buddy
udp-test/extract: fix counter increase in some cases
Remove debug print
udp-test/zutil: do not forget to add tailing '\0' after memmove
udp-test/zutil: Increase output buffer size in order to have at least on line on each zlib invocation
udp-test/extract: more debugging information
Updated to accommodate proper GUI interface.  New GUI interface
controller.

SchedulerController now only handles backend data.
Less verbose announcement
AddedLevelLoaderExtension project
Added code necessary to add complex track
race track asset
added ball asset
new track asset
asset updates (extended racetrack) added bumper
asset update
track update
race track outline
race track hook update
bla
removed hook
corrected racetrack
Added track stuff
final race track
Merge branch 'LevelDesign' of https://github.com/GDGBremen/VHackAndroidGame into LevelDesign
dsadsa
Merge remote-tracking branch 'origin/LevelDesign'

Conflicts:
	Source/src/de/dsi8/vhackandroidgame/RacerGameActivity.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Removing unneeded demo files
changed exit of application to System.exit(0)
just killed some warnings in the given examples
new input and output classes to bundle io functionality
changed io to new io classes
changed io to new io classes
changed to new io classes and refactoring of key recreation
formating and exception messages
Clear fix.
Its comming along!

So the android app has some functionalities.
remove rhino command line integration.
- Reformatted comments
 - Fixed the boundcheck of GetServerCommandLineParmFromIndex()
 - Added native RemoveServerCommandLineParm()
 - Added native AppendServerCommandLineParm()
 - Added native SetServerCommandLine()
- Removed unusable classes
Support for private browsing mode
The clipboard will be cleared when private browsing mode ends, see
https://developer.mozilla.org/en-US/docs/Using_the_Clipboard
adding initial files
Merge branch 'master' of github.com:Intermark/TrelloExtensions
Add some `FIXE ME`statements
URLUtil.containsScheme
back out changes for Windows RunTests
Expand TAB to spaces
Tasks file added
changed ANT build file
changed sql structure
Just a simple commit, nothing too useful, yet.
apply/applyStyle
Calculate date of harvest
Fixed member#short not giving name when short_name is empty string; online testing works.
config: update config #4
Added Tweet with Keyshanc post.
Sticky nav fix, README.md
Columns auto adjusting
Updated sha to a version that works
Merge pull request #118 from vbmithr/master

Updated sha
Merge branch 'master' of git://github.com/OCamlPro/opam-repository
Update archives
Normalize the compiler descriptions

The version & name fields are optional, as they can be infered from the compiler filename, but that's clearer to write them explicitely.
Bump version number
Merge branch 'master' of github.com:OCamlPro/opam-repository
Merge branch 'master' of git://github.com/OCamlPro/opam-repository
Some Javadoc additions
Adding shssword PATH and adding bash completion
Update goodsArray.sqf

Added a2l cars.
Changing site collors, editing some CSS and HTML.
Core/Reputation: More work on manager.

- down to the final 9's still more work to do.
- couple linkers to clear up,
- then testing, adjusting, updating, and cleaning.
- all the fun stuff :/

Signed-off-by: Bootz <bootz@projectskyfire.org>
added examples for the iterator lab
Start menu and few commands done
Fix: Show content for specific roles feature issues.
fix facebook actions
aggiunto popover su portlet other products
move foto
Merge branch 'master' of github.com:RedTurtle/restarter.policy
fix workflow
Removed duplications of documentation
changed the propertiesfile, reference to the correct ui now and deleted a clean ui xml
Add the jQuery Component
Added Multiple File Selection to Reader.
Added total TIC and BIC Spectra.
Add annotation reference for methylation arrays -- already stored in bioconductor
--> Cleanup user/match-specific data
--> .gitignore to permanently ignore config files
Added Session when 'Trade' is clicked on open position

When user clicks trade on a firm's open position they are redirected to
the MakeTrade page and the values are setup for them to quickly make a
trade.
there you go! it´s finally working, following commits will be adjustments :D yai!
Revert "Messaging: Prevent the light from being dismissed when a QM Popup wakes the device"

This reverts commit f0955d3124f398cdc1cbbefe814913dd6a0e5ff4

my bad sorry sorry

Lars
Update projects/code-coverage/it/it-jacoco-maven/README.md
Make speed hack more accurate.
Publish progress indicator now keeps going through the indexing stage
fix pig config
update to Gradle 1.2
update all quantity and discount
changes for trade in value and calculations to refresh data on all screens for any change
get image from public
Merge branch 'master' of github.com:SummersAdvertising/eyeplus
New color "Oyster Shell".
New color scheme "GrauMETRO".
hgoe
Merge branch 'master' of github.com:Takehiro-Adachi/tag_system
htc: fix HTC_MMC options
Fix missing gpio_event device
2012年 08月 31日 星期五 15:13:29 CST
2012年 07月 19日 星期四 20:21:11 CST
Corrected:
- pom.xml to include used encoding (or at least a similar encoding)
 - pom.xml to use a Java-Version with enums (and not the 1.3 default)
 - ByteUtilsArt#byte2toIn to correctly handle bytes where the 7-bit is set, as Java does not know unsigned byte-values
 Add:
 - JUnit 4.5 testing framework
 - A test to show why my change to ByteUtilsArt#byte2toIn is necessary
Implement placeholders and IE fallback.
added initial select box for drink view
Include tools to generate boot images
[ZT] fix ui defect for color picker; minor refactor
Made channel tags available for usage in commands and now uses NC-BukkitLib v2.1
TwitterBootstrap plugin (via @TiuTalk)
Merge commit 'origin/0.2_dev_tora' into 0.2
Changed location not available message. Added tips link when clicking back button
Changed name of assets/DB from CityExplorer to Mini Trondheim (.sqlite)
Removed some bugs in the process.
Removed the select city from preferences
Moved all hard-coded strings from layout.xml files to strings.xml
Site updated at 2012-12-14 15:58:56 UTC
Update src/application.js

Corrected two spelling mistakes in the file description.
Finish content script cleanup
loader first tests
gh-pages almost removed, deprecated
htms5
modificado script de criar usuarios para adicionar enderecos em m1 e m2
Removed a bunch of extra commented out lines.
trying to fix validation error
trying to fix validation error
trying to fix validation error take 3
trying to fix validation error take 4
Merge pull request #733 from tysonn/12-13a

12 13a
Add new SNES effect
Python implementation working

Signed-off-by: Ritchie 'Xenplex' Flick <xenplex@gmail.com>
loadDefaultConfiguration 를 자동으로 실행 하지 않도록 수정
Gem Sprite 에 zOrder 추가
맨 위에 1줄 안 나오는 버그수정
설정에 (룰) 관련 내용 추가. 변수 교체
for back
Merge pull request #23 from ZaNaGeMo/GUI

Gui
Merge pull request #25 from ZaNaGeMo/GUI2.1

Gui2.1
Summenteil um Variablen erweitert
Zuweisung von Summenteil an neue ST_MappingStrat angepasst
isTeilsumme erstellt
Merge pull request #26 from ZaNaGeMo/MappingStrat

Mapping strat
Python Source file
Image Pyramids

http://opencv.itseez.com/doc/tutorials/imgproc/pyramids/pyramids.html#pyramids
fixed the signup button
updating growls controller
Merge pull request #66 from adigitalnative/master

Testing for subscriptions controller
Logging headers
Merge pull request #68 from adigitalnative/headers

Logging headers
Precompiled
user_spec mods
Merge branch 'master' of github.com:dkaufman/feed_engine
Changing specs and controllers for fast testing
Refactoring the processors
Removing logging for headers
Making more changes to the instagram processor
fixing merge conflicts
last commit for cleanup
Merge pull request #69 from adigitalnative/headers

Removing logging for headers
Merge pull request #70 from eweng/master

Cleaning up processors
version 1.0 of python website
using cocoapods to handle dependencies..
deleting ipad specific files in the demo app
Merge pull request #162 from aeronzhou/master

Update Monster, Prop
Signed-off-by: RaoJi <littlekfc@163.com>
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/Alien.cpp
	src/main/AttackDetectComponent.cpp
	src/main/Monster.cpp

Signed-off-by: RaoJi <littlekfc@163.com>
武器粒子特效放到XML
Merge pull request #163 from LiuJack/master

武器粒子特效放到XML
Signed-off-by: RaoJi <littlekfc@163.com>
Signed-off-by: RaoJi <littlekfc@163.com>
Signed-off-by: RaoJi <littlekfc@163.com>
Merge branch 'master' of https://github.com/RaoJi/The-Dark-Crystal
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/SceneLoader.cpp

Signed-off-by: RaoJi <littlekfc@163.com>
Merge pull request #165 from RaoJi/master

shoujian
解决拣枪时mesh消失的bug
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/Alien.cpp
	src/main/SceneLoader.cpp
Signed-off-by: RaoJi <littlekfc@163.com>
Merge pull request #166 from xujianming/master

解决拣枪时mesh消失的bug
Merge pull request #167 from RaoJi/master

提高了AI性能。
commit
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/Alien.cpp
	src/main/EntityManager.cpp
	src/main/SceneLoader.cpp
commit
Merge pull request #169 from LiuJack/master

修改一些小参数
Merge pull request #187 from aeronzhou/master

Fuck SceneLoader, Fuck Holy Bug
一句话的修改+去掉坑爹的fromStdWString
Merge pull request #188 from LiuJack/master

一句话的修改+去掉坑爹的fromStdWString 
去掉蛋疼的MyTest.h
RegEx added for javascript:; type link support
Merge pull request #3 from sgissinger/master

Made a little enhancement
Added the Task class and supporting listener interface and base class to make implementing AsyncTasks with callbacks easier.  Incremented jar version to 0.0.6
Adding mono

Signed-off-by: root <root@flotsam.(none)>
created raw contact form
Site updated at 2012-05-11 19:27:16 UTC
Site updated at 2012-04-10 13:43:59 UTC
readd reset.css
Add route to exception
Instalacion de gemas y configuracion de devise para autenticacion
delete ring.c
Site updated at 2012-11-22 02:55:12 UTC
add rack works, but cannot add device becuase the prop "Devices" is null.
added INotifyCollectionChanged handler/implementation makes it work
Site updated at 2012-05-23 09:55:10 UTC
First checkin.
Merge branch 'master' of https://github.com/amanoras/clj-midje-example

Conflicts:
	README.md
Publication is updated
parameter tweaks
more param tweaks and no duck in 1st person
Remove unused stylesheet.
VideoController.singleMatch doesn't need to be volatile.
Fill in "I enter the video data" step.
List editor view.

This is a first cut at a replacement for the Tag-It editor.
Site updated at 2012-09-23 18:14:44 UTC
Site updated at 2012-09-21 23:02:34 UTC
google analytics for app update as well
commit without github hook integration
bean, calculations complete
Revert "Primeiro commit."

This reverts commit 9c165a913be5c91a3e21bcbf6025dd7a3d6db4ba.
upgrade to 2.0.2-RC2
add bin
Hello Git World Commit
Merge SDK support for source.properties templates.

Requires build.git change Ib36928097

Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
Merge "Merge SDK support for source.properties templates."
Merge branch 'master' of https://android.googlesource.com/platform/development
typo for n1 n2 corrected try 2
more
more
fixed footer links
fixed outgoing likns
moved process_image.py to old/
Change access_token expiration time to 5 minutes.
s3 update
Merge branch 'master' of github.com:appcelerator-alliances/aws
 fold it back
 yack
Grab more YT info
working curve control
Merge branch 'master' into demo
macテスト
Site updated at 2012-06-25 23:10:04 UTC
Site updated at 2012-06-25 23:19:45 UTC
Site updated at 2012-06-26 16:49:29 UTC
Site updated at 2012-06-26 16:53:11 UTC
Site updated at 2012-06-26 16:59:58 UTC
Site updated at 2012-06-26 17:01:42 UTC
Site updated at 2012-06-26 17:03:13 UTC
Site updated at 2012-06-26 17:10:50 UTC
Site updated at 2012-06-26 17:12:23 UTC
Added about page
Site updated at 2012-06-26 17:19:08 UTC
Merge branch 'master' of github.com:aspires/aspires.github.com into source
fixing changes
More info on Builds
Remove useless code
Clean up and new image
Add ugly background colors
Clean names
Desactivate security
Site updated at 2012-06-25 20:34:18 UTC
Merge branch 'topics'
Implemented support for multiple cassandra environments (prod/stage).
Using configurer for cassandra properties.
Cassandra-based EquivalenceSummaryStore
Drop String/Content-based methods of LookupWriter for ContentRef-based
Merge branch 'mbst-2993-stream-equiv' into stage

* mbst-2993-stream-equiv:
  Drop String/Content-based methods of LookupWriter for ContentRef-based
  Cassandra-based EquivalenceSummaryStore
  Using configurer for cassandra properties.
  Implemented support for multiple cassandra environments (prod/stage).

Conflicts:
	src/main/java/org/atlasapi/persistence/CassandraPersistenceModule.java
	src/main/java/org/atlasapi/persistence/cassandra/CassandraSchema.java
	src/main/java/org/atlasapi/persistence/content/cassandra/CassandraContentStore.java
	src/test/java/org/atlasapi/persistence/content/cassandra/CassandraContentStoreTest.java
prueba con iframe3
Working better, sidepots still somewhat broken
#318818 Redis is mocked in tests
worked on the gmail a little bit
[BV-287] Added test to readme_use_case_spec.rb and updated README to show how to find a player by email.
Documentation rebuild

Fix rST syntax and improve the conversion from DocBook
Merge pull request #5 from Maks3w/rebuild

Documentation rebuild
Add missing images
Merge pull request #6 from Maks3w/rebuild

Add missing images
Remove extra blank lines
Merge pull request #7 from Maks3w/rebuild

Remove extra blank lines
Fix document
[Git] Add ZF2 .gitignore
Merge pull request #8 from Maks3w/rebuild

[Git] Add ZF2 .gitignore
Fit lines to 115 characters

The following files needed to be fixed manually:
modified:   modules/zend.http.client.adapters.rst
modified:   modules/zend.http.client.rst
modified:   modules/zend.service.amazon.ec2.image.rst
modified:   modules/zend.service.amazon.ec2.instance.rst
Merge pull request #10 from Maks3w/rebuild

Fit lines to 115 characters
Add missing blankline after methodsynhopsys for varlists
Merge pull request #11 from Maks3w/rebuild

Add missing blankline after methodsynhopsys for varlists
Adding :patch: initializer for Logging::ColorScheme
Comparison fix to make dates relative to now nicer
add support for force_login param without screen_name specified
emacs: set show-paren-delay to 0
Renamed: install-11-ropemacs.sh -> install-11-python.sh
Merge branch 'master' of ssh://github.com/beloglazov/arch-xmonad-zsh
Add version, build script, alter export tag.
Added tests for string converts, made version string.
Change Server.Addresses by using Map<String, List<Address>> instead of
privateList/publicList for Folsom.

Signed-off-by: benn-cs <benn.cs@fengruyi.com>
Equilibrage
Ajout particule
Fixed version number and added a missing line
Changing lanuage file structure.
Fixing spelling error and fixing a heading
Changing font to 15pt
Revising insecure cryptographic storage post
[TIMOB-11620] iOS 6: 'className' property is returned as TiUIObjectProxy
[TIMOB-11745] iOS TableViewRow structures for className meh does not match
[TIMOB-11760] Synchronize rows before appendRow
fix table cell layout issues
[TIMOB-11691] Ensure row data when bubbling events
[TIMOB-11594] Fixed layouts not taking previously laid out children into account
[TIMOB-11781] Fixed bug with Android SDK path not resolving when referenced from the user's home directory.
fix reproxying by skipping setting values that do not change
disable reusable table rows for now
add comment
Merge pull request #3462 from cb1kenobi/timob-11781

[TIMOB-11781] Fixed bug with Android SDK path not resolving when referen...
Merge pull request #3451 from mstepanov/timob-11745

[TIMOB-11745] iOS TableViewRow structures for className meh does not match
Merge pull request #3455 from vishalduggal/timob-11691

[TIMOB-11691] Ensure row data when bubbling events
special handling for className property getter
[TIMOB-11776] Added additional module search paths including the modules path from the config file and the root of the active Titanium SDK.
comment
Merge pull request #3456 from bryan-m-hughes/timob-11594

[TIMOB-11594] Fixed layouts not taking previously laid out children into...
Merge pull request #3375 from mstepanov/timob-11620

[TIMOB-11620] iOS 6: 'className' property is returned as TiUIObjectProxy
Merge pull request #3466 from cb1kenobi/timob-11776

[TIMOB-11776] Added additional module search paths including the modules...
TIMOB-7474 Resolve valid ABIs earlier in the builder process.

Skip and warn about unknown ABIs.

Also make sure only external module library files for desired ABIs are added to the packaged app.
Resolve issue where Build.PL does not generate Build script

git-svn-id: https://svn.perl.org/modules/CPANPLUS-Dist-Build/trunk@15493 50811bd7-b8ce-0310-adc1-d9db26280581
jekyll build on Sun, 09 Sep 2012 05:31:54 +0200 from 93aabde Electrum supports Mac OS
Add Scenario: Double with multiple outputs

- Add method Double#find
- Move registration from Double#initialize to Double#create
- Store registered doubles in a hash by filename instead in an array
- Double#create now returns self
Refactor storage of outputs by argv

- Rename variables to reveal intent
- Store outputs in a hash by argv
Bump version
Merge branch 'multiple_outputs'
updating week 4 and 5 contents
Enabled NEON optimizations on iOS
Merge pull request #471 from blackberry-gaming/next-setaylor

Next setaylor
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Adds gameplay-luagen project, which generates bindings from the Doxygen XML output.
Updates gameplay.doxyfile to generate the needed XML files.
Adds the initial version of the generated Lua bindings along with the ScriptController class.
Scripting support update.
Adds support for detecting name clashes between Lua bindings and Lua keywords.
Renamed end() functions to finish() (Font, MeshBatch, SpriteBatch).
Adds support for using nil/NULL values for strings and object pointers with Lua bindings.
Began adding support for using Lua functions as callbacks and function pointer parameters (currently just Scene::visit).
Fixed a bug with retrieving boolean values from the Lua stack.
Fixed another bug with boolean Lua stack values.
Adds support for calling Game::renderOnce and using the ScreenDisplayer from Lua scripts.
Adds support for setting up material parameter bindings to Node methods from Lua scripts.
Fix for enumerations in Lua scripts so that passing enums from C++ to Lua works properly.
Adds support for key, mouse, touch, and gamepad event callbacks in Lua scripts.
Adds support for calling Game::exit() from Lua scripts.
Adds support for object arrays (i.e. VertexElement*).
Updated primitive data type arrays to use no longer use an intermediate std::vector.
Minor optimization to generated code (class instance type check for member bindings).
Changed Mesh::setVertexData to take a float* parameter so that it can be called from Lua (we need a type).
Reduced compilation dependencies in generated Lua bindings source files (enum bindings are in separate files now).
Updated some gameplay files to play nice with the Lua bindings and generation process.
Adds a separate doxyfile for generating the Lua bindings because we need to include the CPP files (so that we have the correct includes for the generated bindings CPP files).
Fixed a bug in generating bindings for overloaded inherited functions.
Added support for all of gameplay's listener patterns to be used from Lua scripts (using a Lua function callback).
Improved Lua error message reporting when parameters do not match a binding.
Fixed doxygen warnings.
Added a batch file to generate the Doxygen XML files needed for generating the Lua script bindings.
Added separate Visual Studio solution for the gameplay-luagen project.
Updated all samples to work in Windows with the Lua updates.
Reverted mesh sample to normal code (took out Lua testing version).
Updated BB10 projects to work with Lua script support.
Minor fixes (in general and for compiling with Momentics/gcc).
Updated character sample to use compressed textures.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier

Conflicts:
	gameplay-samples/sample03-character/res/common/scene.physics
	gameplay-samples/sample03-character/res/scene.scene
Adds support for a Joystick control.
Updates xcode character sample projects to use texture compression.
Fixes properties caching optimization issue in SceneLoader.
Fixes memory leaks in Bundle and Texture.
Fixes compilation warning in Matrix.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge pull request #441 from blackberry-gaming/next-cculy

Next cculy
Updated visual studio character sample project.
Merge pull request #442 from blackberry-gaming/next-sgrenier

Next sgrenier
Merge pull request #443 from blackberry-gaming/next-ablake

Next ablake: Several UI fixes.
Removes commented code from Vector3::cross(const Vector&, const Vector&, Vector3*).

Renames MathUtil::transpose(const float*, float*) to MathUtil::transposeMatrix(const float*, float*) to follow naming convention.

Fixes:
- Plane::intersects(const Plane&) const now checks to see if the specified Plane is equal to the Plane performing the intersection test against. Theoretically, even though the plane's are parallel, they share the same area and therefore intersect. This was causing a unit test failure.
- Plane::intersection(const Plane&, const Plane&, const Plane&, Vector3*) now checks to see if the absolute value of the determinant is "close enough" to 0.0f, instead of exclusively 0.0f. This was causing a unit test failure.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney
Merge pull request #444 from blackberry-gaming/next-kcunney

General cleanup, and unit test fixes.
Moves definition of MATRIX_SIZE to avoid redefinition.
Adding editable properties to the particles sample, using a scrollable container.
Compilation errors fix.
Merge pull request #445 from blackberry-gaming/next-cculy

Next cculy
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-ablake

Conflicts:
	gameplay/src/Matrix.cpp
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-ablake
Updated Android-specific code for loading files to work with aliases (added for compressed texture support).
Updated character sample to work on Android.
Added Joystick to Android build.
Merge pull request #247 from blackberry-gaming/next-dgough

Next dgough
Fixes gamepad's control of the character.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney
Merge pull request #248 from blackberry-gaming/next-kcunney

Fixes gamepad's control of the character.
proper l-value for non bitpacked tries
0.9.l1
Remove commented-out remnants of source grammar
check result of unit test suite and use proper exit code
only add git commit it to verbose version if it's available
clean up temporary dir for fake modules, avoid unnecessary exec statements
fix various issues with unit tests: fix two failed tests, fix logging and cleanup in /tmp, make sure working dir is restored after running test, correctly restore sys.stdout in easyblock test
Refactored AjaxFileUploader to provide a base class that doesn't return an HTTP response.
Note about drink tickets for afterparty
Merge branch 'master' of github.com:bostonrb/bostonrb-workshop
Reporters now handle setting up Django environment
Dynamically Populated Platform Select Form Works
Begin work to extract using regular stdout's read methods
Change to workflow

A lot of code cleanup here. Created a SubFinder class to consolidate the
SRT generation / creation to simplify the process. Used real thread
handling in the MKVSubExtract, easy to implement in MP4Subextract if
necessary.
Lining up code comments
add: afsp2011 draft tech note
Erase the old .orig dir before preserving.
Fixes, UI Tweaks & Flow changes

* Add shipping details automatically if it's sg and skip the shipping
selection
* Add date time for delivery
* Address user_id nullyfiying fix
* UI Tweaks
- Fixing issue with referenced objects retaining values between calls.
- Fixing the logic of fallback URLs for any given service.
- Giving more verbose error message for failing to locate a service URL.
fixing issue with multiple plots in HSROC case
Merge branch 'master' of github.com:bwallace/OpenMeta-analyst-
- libs
Changing Pygments theme used and working on styling the theme sidebar.
Make sidebar text readable and fix search box.
Project .mako structure reworked - we need to know the heading upfront to render the sidebar. The only project currently converted to the new format is copter.mako
templates now have common 'h.' helpers from /templates/helpers.py
moved templates into templates/html folder and created 'statc' folder for static page templates
fixed static pages
(pondering why the scrollspy is broken)
Initial commit for VODW templates
Fix: documentation for String#humanize
update AD::Journey to follow Rails coding conventions
Merge pull request #8567 from frodsan/update_coding_conventions_journey

update AD::Journey to follow Rails coding conventions
Merge pull request #8560 from u16suzu/master

Fix document for String#humanize

Conflicts:
	activesupport/lib/active_support/core_ext/string/inflections.rb
Add require: false for mocha in Gemfile

Avoid failing tests with mocha 0.12.0 and the fail fast addition:
https://github.com/freerange/mocha/commit/c8eba68973c1e489b99c9f7bca2d5888eca0ac14
Merge pull request #6985 from sidonath/disable-query-cache-for-locks

Disable query cache for lock queries
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
Merge branch '3-2-stable' of https://github.com/rails/rails into 3-2-stable
Rename all action callbacks from *_filter to *_action
Fix README
issue #4 completed - both static and dynamic scenario creation through the json files is working
Merge branch 'issue#4' into develop
haccess file
got site mockups and thier pages done
Added convention-based subscriptions for views
README sync with boilerplate
modified:   2010/2010-01-01-limit-speed-in-squid.markdown
	deleted:    2010/2010-04-09-lighttpd-install.markdown
Merge branch 'release/0.1.0'
Update README.md
Merge branch 'release/0.1.1'
Merge branch 'master' of https://github.com/chernser/DummyAPI-frontend
remove log mesg
Rearrange and style the information on the home page
bumped click numbers
AMCFull data add
[master] change minSdkVersion from 9 to 7
[master] delete res/layout/activity_new_talk_channel.xml
[master] dereference lint.xml from git
[refactor] move all restore state parameter action to restoreSelection()
[refactor] move storing preference function to onCategorySelection() instead of onDestroy()
Merge branch 'refactor'
add provider, contractor and update AndroidManifest.xml
rename/update layout files, and replace ItemListFragment.java with ChannelFragment.java
change pagerIndcator theme parameter and replace getActivity with getSherlockActivity
add all news categories type defined in newtalk website
Merge branch 'add_provider_and_contracts'
[issue #38] added downscaling scenario utility class and integrated scenario descriptions and detail links into the downscaling wizards
[issue #38] i18n of scenario information
Merge branch 'feature/38-ds-scenario-description' into dev
Removing Qt auto-generated files
Two types of enemies
Adding git ignore and example report. Report needs to be edited quite a bit.
pass php.ini path to php-fpm
Add composer example to readme file
Allow im.crop() to crop to arbitrary rectangles within image.
Tweaking the menu.
Only have one H1 per page.
Add projects the the homepage.
Menu + other misc visual tweaks.
Site updated at 2012-03-12 04:55:55 UTC
+ agregamos date picker para probar formulario de consulta de horarios
added a jquery plugin called animateOn
Merge pull request #6 from swaroopsm/exp

added a jquery plugin called animateOn
Removing onerror
removed the shadow from the compiler output and change the color to black
updated mark's image and re-instated the indiegogo image
Added Resources controller, index view and route match
take quotation out of other email template
libcif integration
rename in configure.ac
depfix
bugfix
chgt de name en bank_name pour le modèle BankAccount, adaptation des spec plus suppression des champs book_id pour Cash et BankAccount
introduction du champ nomenclature pour le modèle Organisme
rajout du modèle Nomenclature et liaison avec Organism, ainsi qu avec Compta::Nomenclature
period#nomenclature utilise la nouvelle logique, les forms de organismes ont été adaptés, et création d une vue update pour le modèle nomenclature
création du controller admin_nomenclatures et action edit
remplacement des routes organism->period->account par period->account pour la zone admin. root est mis à session/new
utilisation de reset_session en amont de session/new
correction typo dans routes root et ajout de admin/accounts_controller_spec.rb
revu la nomenclature pour les entreprise
le document benevolat n est proposé que si le statut est associatif
View of shortest path is working - need to fix finding shortest path cause there are problems with timeline
Added back link to the buses;changed form for tickets - now fields 'from' and
Ticket index will show only tickets which are available to reserve
refactoring of the ticket index - new method in ticket controller.Creating index of travel history.
Added a README file.
Made git-like-cli version configurable in the root POM to allow other projects to depend on the same version.
Removed log4j.properties file.
Some more refactoring (use @Inject for Help, simplify main(), etc) and some new tests.
Problem8
solved

nested FOR loops and saving off the high values
t3_middleware
Merge branch 't3_middleware'
clear deprication
fix bug(flag parse function returns an invalid result)

 * NGX_OK    -> 0
 * NGX_ERROR -> -1

caller expects that return value is 1 when first argument 's' is 1.
add paramenter 'rmprof'

'rmprof=y' make a image removed its profile
tidied up site
New state and waypoint messages defined, some comments in teleop
Merge branch 'master' of https://github.com/cwrucutter/cwrucutter_core
remove mention of jsmin license, since it's not bundle anymore
Filter Invoices nased on Status and Client Fields
 Adding Time format to display invoice date
Adding styling for invoice filtering, and changing invoice list layout
Added setLegends function support
Fix POM by removing duplicate execution IDs
remove public/index.html
Finish layout and routes
Added Prelude settigns with updated colors, type, ...
Fix bugs, basic sms-tweet now working, similar for admin
Modificación para que muestre la lista por hard code.
undecorate link db btn
Added 'text/csv'-serializer (to serialize/deserialize between iterable container of dicts and RFC4180 style CSV)
Added 'sphinxtogithub' for [docs] to support gh-pages.
configured lineman to load our dependencies in the right order, this configuration happens once and then we can forget about it, also added some of the usual files i put in place when setting up a rich client application
spiked out our UI with some backbone views, a router, and wired them all up so it is clickable; we also added responsive styles to the theme so things look right at smaller resolutions
nettoyage, encore plus fort